Buffer parameters to be used after unlocking, fixed preview size crash

JeroenMols · Dec 12, 2015 · ef7b3ff · ef7b3ff
1 parent ef82369
commit ef7b3ff
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/.../src/androidTest/java/com/jmolsmobile/landscapevideocapture/camera/CameraWrapperTest.java b/.../src/androidTest/java/com/jmolsmobile/landscapevideocapture/camera/CameraWrapperTest.java
@@ -254,16 +254,6 @@ public void setPreviewSize() throws Exception {
 
         wrapper.configureForPreview(800, 600);
 
-        verify(mockCamera.getNativeCameraParameters(), times(1)).setPreviewSize(700, 300);
-    }
-
-    @Test
-    public void setPreviewSizeDisplay90() throws Exception {
-        NativeCamera mockCamera = createCameraWithMockParameters(0, 0, 300, 700);
-        final CameraWrapper wrapper = new CameraWrapper(mockCamera, Surface.ROTATION_90);
-
-        wrapper.configureForPreview(800, 600);
-
         verify(mockCamera.getNativeCameraParameters(), times(1)).setPreviewSize(300, 700);
     }
 

diff --git a/library/src/main/java/com/jmolsmobile/landscapevideocapture/camera/CameraWrapper.java b/library/src/main/java/com/jmolsmobile/landscapevideocapture/camera/CameraWrapper.java
@@ -124,11 +124,7 @@ public void configureForPreview(int viewWidth, int viewHeight) {
         final Parameters params = mNativeCamera.getNativeCameraParameters();
         final CameraSize previewSize = getOptimalSize(params.getSupportedPreviewSizes(), viewWidth, viewHeight);
 
-        if (getRotationCorrection() % 180 == 0) {
-            params.setPreviewSize(previewSize.getHeight(), previewSize.getWidth());
-        } else {
-            params.setPreviewSize(previewSize.getWidth(), previewSize.getHeight());
-        }
+        params.setPreviewSize(previewSize.getWidth(), previewSize.getHeight());
         params.setPreviewFormat(ImageFormat.NV21);
         mNativeCamera.updateNativeCameraParameters(params);
         mNativeCamera.setDisplayOrientation(getRotationCorrection());

diff --git a/library/src/main/java/com/jmolsmobile/landscapevideocapture/camera/NativeCamera.java b/library/src/main/java/com/jmolsmobile/landscapevideocapture/camera/NativeCamera.java
@@ -16,7 +16,8 @@
 public class
 NativeCamera {
 
-    private Camera camera = null;
+    private Camera     camera = null;
+    private Parameters params = null;
 
     public Camera getNativeCamera() {
         return camera;
@@ -51,10 +52,14 @@ public void clearNativePreviewCallback() {
     }
 
     public Parameters getNativeCameraParameters() {
-        return camera.getParameters();
+        if (params == null) {
+            params = camera.getParameters();
+        }
+        return params;
     }
 
     public void updateNativeCameraParameters(Parameters params) {
+        this.params = params;
         camera.setParameters(params);
     }