Fix camera face swith bug

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>
camera2
Leo Ma 9 years ago
parent 0c24613585
commit 3b7d80db76

@ -47,7 +47,7 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
private Camera mCamera; private Camera mCamera;
private ByteBuffer mGlPreviewBuffer; private ByteBuffer mGlPreviewBuffer;
private int mCamId = Camera.CameraInfo.CAMERA_FACING_FRONT; private int mCamId = -1;
private int mPreviewRotation = 90; private int mPreviewRotation = 90;
private Thread worker; private Thread worker;
@ -193,7 +193,7 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
if (mCamera != null) { if (mCamera != null) {
return false; return false;
} }
if (mCamId > (Camera.getNumberOfCameras() - 1) || mCamId < 0) { if (mCamId > (Camera.getNumberOfCameras() - 1)) {
return false; return false;
} }
@ -220,6 +220,7 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
}); });
worker.start(); worker.start();
if (mCamId < 0) {
Camera.CameraInfo info = new Camera.CameraInfo(); Camera.CameraInfo info = new Camera.CameraInfo();
int numCameras = Camera.getNumberOfCameras(); int numCameras = Camera.getNumberOfCameras();
for (int i = 0; i < numCameras; i++) { for (int i = 0; i < numCameras; i++) {
@ -230,6 +231,9 @@ public class SrsCameraView extends GLSurfaceView implements GLSurfaceView.Render
break; break;
} }
} }
} else {
mCamera = Camera.open(mCamId);
}
if (mCamera == null) { if (mCamera == null) {
mCamera = Camera.open(); mCamera = Camera.open();
mCamId = 0; mCamId = 0;

Loading…
Cancel
Save