Skip to content

Commit

Permalink
crash 修复
Browse files Browse the repository at this point in the history
  • Loading branch information
shancheli321 committed Aug 16, 2024
1 parent 63c5c29 commit cfd6865
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 11 deletions.
24 changes: 16 additions & 8 deletions AppCamera/src/main/java/com/lf/cameralibrary/CameraInterface.java
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
@SuppressWarnings("deprecation")
public class CameraInterface implements Camera.PreviewCallback {

private static final String TAG = "CJT";
private static final String TAG = "CameraInterface--camera--";

private volatile static CameraInterface mCameraInterface;

Expand Down Expand Up @@ -395,9 +395,9 @@ public void doStartPreview(SurfaceHolder holder, float screenProp) {
mCamera.setPreviewCallback(this); //每一帧回调
mCamera.startPreview();//启动浏览
isPreviewing = true;
Log.i(TAG, "=== Start Preview ===");
} catch (IOException e) {
e.printStackTrace();
Log.d(TAG, "=== Start Preview ===");
} catch (Exception e) {
Log.d(TAG, "doStartPreview--预览异常---" + e);
}
}
}
Expand Down Expand Up @@ -553,7 +553,10 @@ public void startRecord(Surface surface, float screenProp, ErrorCallback callbac
videoSize = CameraParamUtil.getInstance().getPreviewSize(mParams.getSupportedVideoSizes(), 600,
screenProp);
}
Log.i(TAG, "setVideoSize width = " + videoSize.width + "height = " + videoSize.height);
Log.d(TAG, "mParams---" + mParams.toString());
Log.d(TAG, "setVideoSize-- width = " + videoSize.width + "height = " + videoSize.height);
Log.d(TAG, "preview-- preview_width = " + preview_width + "preview_height = " + preview_height);

if (videoSize.width == videoSize.height) {
mediaRecorder.setVideoSize(preview_width, preview_height);
} else {
Expand Down Expand Up @@ -593,11 +596,16 @@ public void startRecord(Surface surface, float screenProp, ErrorCallback callbac

if (DeviceUtil.isHuaWeiRongyao()) {
mediaRecorder.setVideoEncodingBitRate(4 * 100000);
Log.d(TAG, "setVideoEncodingBitRate---4 * 100000" );

} else {
mediaRecorder.setVideoEncodingBitRate(mediaQuality);
Log.d(TAG, "setVideoEncodingBitRate---" + mediaQuality);

}
mediaRecorder.setPreviewDisplay(surface);


videoFileName = "video_" + System.currentTimeMillis() + ".mp4";
if (saveVideoPath.equals("")) {
saveVideoPath = Environment.getExternalStorageDirectory().getPath();
Expand All @@ -610,18 +618,18 @@ public void startRecord(Surface surface, float screenProp, ErrorCallback callbac
isRecorder = true;
} catch (IllegalStateException e) {
e.printStackTrace();
Log.i("CJT", "startRecord IllegalStateException");
Log.d(TAG, "startRecord IllegalStateException");
if (this.errorLisenter != null) {
this.errorLisenter.onError();
}
} catch (IOException e) {
e.printStackTrace();
Log.i("CJT", "startRecord IOException");
Log.d(TAG, "startRecord IOException");
if (this.errorLisenter != null) {
this.errorLisenter.onError();
}
} catch (RuntimeException e) {
Log.i("CJT", "startRecord RuntimeException");
Log.d(TAG, "startRecord RuntimeException");
}
}

Expand Down
7 changes: 4 additions & 3 deletions AppCamera/src/main/java/com/lf/cameralibrary/JCameraView.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
*/
public class JCameraView extends FrameLayout implements CameraInterface.CameraOpenOverCallback, SurfaceHolder
.Callback, CameraView {
// private static final String TAG = "JCameraView";

private static final String TAG = "JCameraView--camera--";

//Camera状态机
private CameraMachine machine;
Expand Down Expand Up @@ -533,8 +534,8 @@ public void onPrepared(MediaPlayer mp) {
});
mMediaPlayer.setLooping(true);
mMediaPlayer.prepare();
} catch (IOException e) {
e.printStackTrace();
} catch (Exception e) {
Log.d(TAG, "playVideo---播放异常---" + e);
}
}
}).start();
Expand Down

0 comments on commit cfd6865

Please sign in to comment.