@carviz/capacitor-camera-preview 8.0.2 → 8.0.3

package/android/src/main/java/com/ahm/capacitor/camera/preview/Preview.java

@@ -104,46 +104,55 @@ class Preview extends RelativeLayout implements SurfaceHolder.Callback, TextureV
         if (mCamera == null) {
             return;
         }
-        Camera.CameraInfo info = new Camera.CameraInfo();
-        int rotation = ((Activity) getContext()).getWindowManager().getDefaultDisplay().getRotation();
-        int degrees = 0;
-        DisplayMetrics dm = new DisplayMetrics();
-
-        Camera.getCameraInfo(cameraId, info);
-        ((Activity) getContext()).getWindowManager().getDefaultDisplay().getMetrics(dm);
-
-        switch (rotation) {
-            case Surface.ROTATION_0:
-                degrees = 0;
-                break;
-            case Surface.ROTATION_90:
-                degrees = 90;
-                break;
-            case Surface.ROTATION_180:
-                degrees = 180;
-                break;
-            case Surface.ROTATION_270:
-                degrees = 270;
-                break;
-        }
-        facing = info.facing;
-        if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
-            displayOrientation = (info.orientation + degrees) % 360;
-            displayOrientation = (360 - displayOrientation) % 360;
-        } else {
-            displayOrientation = (info.orientation - degrees + 360) % 360;
-        }
+        try {
+            Camera.CameraInfo info = new Camera.CameraInfo();
+            int rotation = ((Activity) getContext()).getWindowManager().getDefaultDisplay().getRotation();
+            int degrees = 0;
+            DisplayMetrics dm = new DisplayMetrics();
+
+            Camera.getCameraInfo(cameraId, info);
+            ((Activity) getContext()).getWindowManager().getDefaultDisplay().getMetrics(dm);
+
+            switch (rotation) {
+                case Surface.ROTATION_0:
+                    degrees = 0;
+                    break;
+                case Surface.ROTATION_90:
+                    degrees = 90;
+                    break;
+                case Surface.ROTATION_180:
+                    degrees = 180;
+                    break;
+                case Surface.ROTATION_270:
+                    degrees = 270;
+                    break;
+            }
+            facing = info.facing;
+            if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+                displayOrientation = (info.orientation + degrees) % 360;
+                displayOrientation = (360 - displayOrientation) % 360;
+            } else {
+                displayOrientation = (info.orientation - degrees + 360) % 360;
+            }
 
-        Log.d(TAG, "screen is rotated " + degrees + "deg from natural");
-        Log.d(
-            TAG,
-            (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT ? "front" : "back") +
-            " camera is oriented -" +
-            info.orientation +
-            "deg from natural"
-        );
-        Log.d(TAG, "need to rotate preview " + displayOrientation + "deg");
-        mCamera.setDisplayOrientation(displayOrientation);
+            Log.d(TAG, "screen is rotated " + degrees + "deg from natural");
+            Log.d(
+                TAG,
+                (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT ? "front" : "back") +
+                " camera is oriented -" +
+                info.orientation +
+                "deg from natural"
+            );
+            Log.d(TAG, "need to rotate preview " + displayOrientation + "deg");
+            mCamera.setDisplayOrientation(displayOrientation);
+        } catch (RuntimeException e) {
+            // The Camera1 handle can be released / mid-teardown / not yet fully opened when an
+            // orientation or configuration change arrives (screen-orientation lock/unlock, device
+            // rotation, or leaving the camera screen). In that state Camera.setDisplayOrientation()
+            // throws "set display orientation failed". Swallow it: the preview is either going away,
+            // or the orientation is re-applied by startCamera() on the next valid surface pass.
+            Log.e(TAG, "setCameraDisplayOrientation failed; camera in invalid state", e);
+        }
     }
 
     public void switchCamera(Camera camera, int cameraId) {
@@ -331,7 +340,10 @@ class Preview extends RelativeLayout implements SurfaceHolder.Callback, TextureV
         Camera.Parameters parameters = mCamera.getParameters();
         parameters.setPreviewSize(mPreviewSize.width, mPreviewSize.height);
         requestLayout();
-        //mCamera.setDisplayOrientation(90);
+        // Re-apply orientation on a camera just confirmed alive by getParameters() above. This
+        // self-heals if setCameraDisplayOrientation() was swallowed during a config-change race:
+        // a rotation resizes the surface, so surfaceChanged -> startCamera() runs here.
+        setCameraDisplayOrientation();
         mCamera.setParameters(parameters);
         mCamera.startPreview();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carviz/capacitor-camera-preview",
-  "version": "8.0.2",
+  "version": "8.0.3",
   "description": "Fork of the capacitor-community/camera-preview plugin focusing on high resolution photos without bloating up the code.",
   "type": "module",
   "main": "dist/plugin.cjs.js",