Skip to content
Snippets Groups Projects
Commit 861fb513 authored by Leo Ma's avatar Leo Ma
Browse files

Decouple encoding and camera


Signed-off-by: default avatarLeo Ma <begeekmyfriend@gmail.com>
parent 64f1ac15
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -88,11 +88,11 @@ public class SrsCameraView extends SurfaceView implements SurfaceHolder.Callback
return new int[] { mPreviewWidth, mPreviewHeight };
}
private void enableEncoding() {
public void enableEncoding() {
mIsEncoding = true;
}
private void disableEncoding() {
public void disableEncoding() {
mIsEncoding = false;
}
Loading
Loading
@@ -104,8 +104,6 @@ public class SrsCameraView extends SurfaceView implements SurfaceHolder.Callback
}
}
enableEncoding();
Camera.Parameters params = mCamera.getParameters();
int[] range = adaptFpsRange(SrsEncoder.VFPS, params.getSupportedPreviewFpsRange());
params.setPreviewFpsRange(range[0], range[1]);
Loading
Loading
Loading
Loading
@@ -138,6 +138,8 @@ public class SrsPublisher {
return;
}
mCameraView.enableEncoding();
startAudio();
}
Loading
Loading
@@ -243,16 +245,14 @@ public class SrsPublisher {
}
public void switchCameraFace(int id) {
if (mEncoder.isEnabled()) {
mCameraView.stopCamera();
mCameraView.setCameraId(id);
if (id == 0) {
mEncoder.setCameraBackFace();
} else {
mEncoder.setCameraFrontFace();
}
mCameraView.startCamera();
mCameraView.stopCamera();
mCameraView.setCameraId(id);
if (id == 0) {
mEncoder.setCameraBackFace();
} else {
mEncoder.setCameraFrontFace();
}
mCameraView.startCamera();
}
public void setRtmpHandler(RtmpHandler handler) {
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment