fix: address PR review comments

- opt-in ExperimentalCamera2Interop to suppress lint UnsafeOptInUsageError
- MainActivity: fix String identity comparison (== -> .equals())
- CameraDemoActivity: add null guard for createVideoOutputPath() result;
  guard getCameraProvider() NPE in onPause
- FileUtil: invalidate storagePath cache in init() to allow re-resolution
- PermissionUtil: only pass missing permissions to requestPermissions(),
  not the full array
- CameraGLSurfaceView: make mCameraProvider volatile; synchronize
  getCameraProvider(), setCameraProvider(), and setFlashMode(); forward
  existing preview size to newly set provider
- CameraGLSurfaceView: fix deprecated focusAtPoint to pass actual Camera
  instance instead of null to legacy AutoFocusCallback
- CameraGLSurfaceViewWithTexture: onSwitchCamera now checks
  needsManualRotation() before applying PI/2 rotation so CameraX
  preserves its own orientation handling
- Camera1Provider: replace hardcoded 90-degree JPEG rotation with
  CameraInfo-derived rotation (handles front camera correctly)
- CameraXProvider: replace deprecated setTargetResolution() with
  ResolutionSelector/ResolutionStrategy for Preview and ImageCapture
- CameraXProvider: move takePicture image conversion to background
  executor to avoid blocking the main thread
- CameraXProvider: fix imageProxyToYuvImage to correctly copy Y plane
  row-by-row using rowStride and build NV21 chroma using per-pixel
  and per-row strides, fixing corrupted output when rowStride != width
- Pass EXTRA_CAMERA_API to all activities in MainActivity, not just
  CameraDemoActivity, so FaceTrackingDemoActivity honours the user's
  camera API selection
- Restore thread interrupt status in CameraXProvider.openCamera() when
  catching InterruptedException to avoid silently discarding the signal
- Add TODO comment in values-v35/styles.xml noting that
  windowOptOutEdgeToEdgeEnforcement is deprecated in API 36 and will
  require proper insets handling when targeting Android 16

Author: wysaid

cgeDemo/src/main/java/org/wysaid/cgeDemo/CameraDemoActivity.java

@@ -115,6 +115,12 @@ public void onClick(View v) {
                 btn.setText("Recording");
                 Log.i(LOG_TAG, "Start recording...");
                 recordFilename = createVideoOutputPath();
+                if (recordFilename == null) {
+                    Log.e(LOG_TAG, "Failed to create video output path");
+                    showText("Failed to create output path");
+                    isValid = true;
+                    return;
+                }
                 mCameraView.startRecording(recordFilename, new CameraRecordGLSurfaceView.StartRecordingCallback() {
                     @Override
                     public void startRecordingOver(boolean success) {
@@ -531,7 +537,10 @@ public void onDestroy() {
     @Override
     public void onPause() {
         super.onPause();
-        mCameraView.getCameraProvider().closeCamera();
+        ICameraProvider provider = mCameraView.getCameraProvider();
+        if (provider != null) {
+            provider.closeCamera();
+        }
         Log.i(LOG_TAG, "activity onPause...");
         mCameraView.release(null);
         mCameraView.onPause();

cgeDemo/src/main/java/org/wysaid/cgeDemo/MainActivity.java

@@ -226,7 +226,7 @@ public void setDemo(DemoClassDescription demo) {
         @Override
         public void onClick(final View v) {
 
-            if (mDemo.activityName == "FaceTrackingDemoActivity") {
+            if ("FaceTrackingDemoActivity".equals(mDemo.activityName)) {
                 MsgUtil.toastMsg(v.getContext(), "Error: Please checkout the branch 'face_features' for this demo!");
                 return;
             }
@@ -244,12 +244,11 @@ public void onClick(final View v) {
                 if (cls != null) {
                     Intent intent = new Intent(MainActivity.this, cls);
 
-                    // Pass camera API selection only to explicitly supported activities
-                    if ("CameraDemoActivity".equals(mDemo.activityName)) {
-                        SharedPreferences prefs = getSharedPreferences(PREFS_NAME, MODE_PRIVATE);
-                        String api = prefs.getString(PREFS_KEY_CAMERA_API, CAMERA_API_CAMERA1);
-                        intent.putExtra(EXTRA_CAMERA_API, api);
-                    }
+                    // Pass camera API selection to all activities; those that don't use it
+                    // will simply ignore the extra.
+                    SharedPreferences prefs = getSharedPreferences(PREFS_NAME, MODE_PRIVATE);
+                    String api = prefs.getString(PREFS_KEY_CAMERA_API, CAMERA_API_CAMERA1);
+                    intent.putExtra(EXTRA_CAMERA_API, api);
 
                     startActivity(intent);
                 }

cgeDemo/src/main/res/values-v35/styles.xml

@@ -4,7 +4,10 @@
     <!-- Android 15 (API 35) enforces edge-to-edge by default when compileSdkVersion >= 35,
          which causes system bars to overlay app content. Since this demo app uses a traditional
          ActionBar layout and does not implement windowing insets handling, we opt out of the
-         forced edge-to-edge behaviour to restore the standard window fitting. -->
+         forced edge-to-edge behaviour to restore the standard window fitting.
+         TODO: On Android 16 (API 36), windowOptOutEdgeToEdgeEnforcement is deprecated and
+         disabled — apps targeting API 36+ cannot opt out of edge-to-edge. When minSdk or
+         compileSdk is raised to 36, migrate the layout to handle window insets properly. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>

library/src/main/java/org/wysaid/camera/Camera1Provider.java

@@ -141,6 +141,40 @@ public void setFocusMode(String focusMode) {
 
     // ========== Capture ==========
 
+    /**
+     * Computes the JPEG rotation needed so the output appears upright for the given camera facing.
+     *
+     * <p>Uses {@link Camera.CameraInfo#orientation} (the sensor-to-natural-orientation angle) as
+     * the base. For back-facing cameras this value is already correct for portrait mode. For
+     * front-facing cameras the mirror effect requires a compensating inversion.
+     *
+     * <p>Note: A full implementation would also factor in the display rotation
+     * ({@code getWindowManager().getDefaultDisplay().getRotation()}). Because
+     * {@link Camera1Provider} has no {@link android.content.Context} reference, the display
+     * rotation is assumed to be 0° (portrait). This covers the dominant use-case; if your app
+     * needs landscape support, inject a Context and apply the standard Camera1 rotation formula.
+     *
+     * @param facing the Camera1 facing constant ({@link Camera.CameraInfo#CAMERA_FACING_BACK} etc.)
+     * @return clockwise JPEG rotation in degrees
+     */
+    private int computeJpegRotation(int facing) {
+        int numberOfCameras = Camera.getNumberOfCameras();
+        Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
+        for (int i = 0; i < numberOfCameras; i++) {
+            Camera.getCameraInfo(i, cameraInfo);
+            if (cameraInfo.facing == facing) {
+                if (facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+                    // Front camera: compensate mirror
+                    return (360 - cameraInfo.orientation) % 360;
+                } else {
+                    return cameraInfo.orientation;
+                }
+            }
+        }
+        // Fallback if no matching camera found
+        return 90;
+    }
+
     @Override
     public void takePicture(ShutterCallback shutterCallback, PictureDataCallback pictureCallback) {
         Camera cameraDevice = CameraInstance.getInstance().getCameraDevice();
@@ -152,11 +186,14 @@ public void takePicture(ShutterCallback shutterCallback, PictureDataCallback pic
             return;
         }
 
+        int camera1Facing = CameraInstance.getInstance().getFacing();
+        int jpegRotation = computeJpegRotation(camera1Facing);
+
         // Set rotation
         Camera.Parameters params = CameraInstance.getInstance().getParams();
         if (params != null) {
             try {
-                params.setRotation(90);
+                params.setRotation(jpegRotation);
                 CameraInstance.getInstance().setParams(params);
             } catch (Exception e) {
                 Log.e(LOG_TAG, "Error setting rotation: " + e.toString());
@@ -168,9 +205,10 @@ public void takePicture(ShutterCallback shutterCallback, PictureDataCallback pic
                 : null;
 
         CameraFacing currentFacing = getFacing();
+        final int captureRotation = jpegRotation;
         cameraDevice.takePicture(legacyShutter, null, (data, camera) -> {
             if (pictureCallback != null) {
-                pictureCallback.onPictureTaken(data, currentFacing, 90);
+                pictureCallback.onPictureTaken(data, currentFacing, captureRotation);
             }
         });
     }

library/src/main/java/org/wysaid/camera/CameraXProvider.java

@@ -11,6 +11,7 @@
 import android.view.Surface;
 
 import androidx.camera.camera2.interop.Camera2Interop;
+import androidx.camera.camera2.interop.ExperimentalCamera2Interop;
 
 import androidx.annotation.NonNull;
 import androidx.camera.core.Camera;
@@ -24,6 +25,8 @@
 import androidx.camera.core.ImageProxy;
 import androidx.camera.core.Preview;
 import androidx.camera.core.SurfaceRequest;
+import androidx.camera.core.resolutionselector.ResolutionSelector;
+import androidx.camera.core.resolutionselector.ResolutionStrategy;
 import androidx.camera.lifecycle.ProcessCameraProvider;
 import androidx.core.content.ContextCompat;
 import androidx.lifecycle.LifecycleOwner;
@@ -34,6 +37,8 @@
 
 import java.nio.ByteBuffer;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * CameraX implementation of {@link ICameraProvider}.
@@ -77,6 +82,9 @@ public class CameraXProvider implements ICameraProvider {
     private boolean mPictureSizeBigger = true;
     private FlashMode mFlashMode = FlashMode.OFF;
 
+    /** Single-thread executor used to process captured images off the main thread. */
+    private final ExecutorService mCaptureExecutor = Executors.newSingleThreadExecutor();
+
     public CameraXProvider(@NonNull Context context) {
         mContext = context.getApplicationContext();
     }
@@ -108,8 +116,11 @@ public boolean openCamera(CameraFacing facing, CameraOpenCallback callback) {
                 if (callback != null) {
                     callback.cameraReady();
                 }
-            } catch (ExecutionException | InterruptedException e) {
+            } catch (ExecutionException e) {
+                Log.e(LOG_TAG, "CameraX: Failed to get ProcessCameraProvider: " + e.toString());
+            } catch (InterruptedException e) {
                 Log.e(LOG_TAG, "CameraX: Failed to get ProcessCameraProvider: " + e.toString());
+                Thread.currentThread().interrupt();
             }
         }, ContextCompat.getMainExecutor(mContext));
 
@@ -346,11 +357,11 @@ public void takePicture(ShutterCallback shutterCallback, PictureDataCallback pic
             shutterCallback.onShutter();
         }
 
-        mImageCapture.takePicture(ContextCompat.getMainExecutor(mContext),
+        mImageCapture.takePicture(mCaptureExecutor,
                 new ImageCapture.OnImageCapturedCallback() {
                     @Override
                     public void onCaptureSuccess(@NonNull ImageProxy image) {
-                        // Convert ImageProxy to JPEG bytes
+                        // Convert ImageProxy to JPEG bytes on the background thread.
                         byte[] jpegData = imageProxyToJpeg(image);
                         int rotation = image.getImageInfo().getRotationDegrees();
                         image.close();
@@ -377,6 +388,7 @@ public void resumePreviewAfterCapture() {
 
     // ========== Internal ==========
 
+    @androidx.annotation.OptIn(markerClass = ExperimentalCamera2Interop.class)
     private void bindCamera() {
         if (mCameraProvider == null || mLifecycleOwner == null || mSurfaceTexture == null) {
             return;
@@ -391,13 +403,16 @@ private void bindCamera() {
 
             // Build Preview use case with target resolution
             Preview.Builder previewBuilder = new Preview.Builder();
-            previewBuilder.setTargetResolution(
-                    new Size(mPreferredPreviewWidth, mPreferredPreviewHeight));
+            ResolutionSelector previewResolutionSelector = new ResolutionSelector.Builder()
+                    .setResolutionStrategy(new ResolutionStrategy(
+                            new Size(mPreferredPreviewWidth, mPreferredPreviewHeight),
+                            ResolutionStrategy.FALLBACK_RULE_CLOSEST_HIGHER_THEN_LOWER))
+                    .build();
+            previewBuilder.setResolutionSelector(previewResolutionSelector);
 
             // Request high frame rate (up to 60fps) to match Camera1 behavior.
             // Camera2Interop allows setting Camera2 capture-request options on CameraX use cases.
             // Using Range(30, 60) so the camera picks the best rate it supports.
-            @SuppressWarnings("unchecked")
             Camera2Interop.Extender<Preview> extender = new Camera2Interop.Extender<>(previewBuilder);
             extender.setCaptureRequestOption(
                     CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE, new Range<>(30, 60));
@@ -432,7 +447,12 @@ private void bindCamera() {
 
             // Build ImageCapture use case
             ImageCapture.Builder captureBuilder = new ImageCapture.Builder();
-            captureBuilder.setTargetResolution(new Size(mPictureWidth, mPictureHeight));
+            ResolutionSelector captureResolutionSelector = new ResolutionSelector.Builder()
+                    .setResolutionStrategy(new ResolutionStrategy(
+                            new Size(mPictureWidth, mPictureHeight),
+                            ResolutionStrategy.FALLBACK_RULE_CLOSEST_HIGHER_THEN_LOWER))
+                    .build();
+            captureBuilder.setResolutionSelector(captureResolutionSelector);
 
             // Apply current flash mode
             switch (mFlashMode) {
@@ -492,6 +512,10 @@ private byte[] imageProxyToJpeg(ImageProxy image) {
 
     /**
      * Convert ImageProxy (YUV_420_888) to YuvImage (NV21).
+     *
+     * <p>Correctly handles the case where a plane's {@code rowStride} is wider than the image
+     * width (padding rows), by copying exactly {@code width} bytes per row for the Y plane and
+     * using {@code rowStride}/{@code pixelStride} offsets for the chroma planes.
      */
     private android.graphics.YuvImage imageProxyToYuvImage(ImageProxy image) {
         if (image.getFormat() != android.graphics.ImageFormat.YUV_420_888) {
@@ -503,47 +527,42 @@ private android.graphics.YuvImage imageProxyToYuvImage(ImageProxy image) {
         int width = image.getWidth();
         int height = image.getHeight();
 
-        // Y plane
+        int yRowStride = planes[0].getRowStride();
+        int chromaRowStride = planes[1].getRowStride();
+        int chromaPixelStride = planes[1].getPixelStride();
+
         ByteBuffer yBuffer = planes[0].getBuffer();
-        // U plane
         ByteBuffer uBuffer = planes[1].getBuffer();
-        // V plane
         ByteBuffer vBuffer = planes[2].getBuffer();
 
-        int ySize = yBuffer.remaining();
-        int uSize = uBuffer.remaining();
-        int vSize = vBuffer.remaining();
-
-        byte[] nv21 = new byte[ySize + width * height / 2];
+        byte[] nv21 = new byte[width * height * 3 / 2];
 
-        // Copy Y
-        yBuffer.get(nv21, 0, ySize);
+        // Copy Y plane row-by-row to strip any row-stride padding.
+        for (int row = 0; row < height; row++) {
+            yBuffer.position(row * yRowStride);
+            yBuffer.get(nv21, row * width, width);
+        }
 
-        // Interleave V and U (NV21 = YYYYVUVU)
+        // Read the full V and U plane buffers (may contain padding).
+        int vSize = vBuffer.remaining();
+        int uSize = uBuffer.remaining();
         byte[] vData = new byte[vSize];
         byte[] uData = new byte[uSize];
+        vBuffer.rewind();
         vBuffer.get(vData);
+        uBuffer.rewind();
         uBuffer.get(uData);
 
-        int uvIndex = ySize;
-        int pixelStride = planes[1].getPixelStride();
-
-        if (pixelStride == 2) {
-            // Already interleaved (common case)
-            // V plane in NV21 comes first, but the interleaved buffer from CameraX
-            // may already be in the right order if the V plane starts first
-            for (int i = 0; i < vSize && uvIndex < nv21.length; i += pixelStride) {
-                nv21[uvIndex++] = vData[i];
-                if (i < uSize && uvIndex < nv21.length) {
-                    nv21[uvIndex++] = uData[i];
+        // Interleave V then U into NV21, using per-pixel and per-row strides to skip padding.
+        int uvIndex = width * height;
+        for (int row = 0; row < height / 2; row++) {
+            for (int col = 0; col < width / 2; col++) {
+                int srcOffset = row * chromaRowStride + col * chromaPixelStride;
+                if (srcOffset < vSize && uvIndex < nv21.length) {
+                    nv21[uvIndex++] = vData[srcOffset];
                 }
-            }
-        } else {
-            // Pixel stride == 1, need to manually interleave
-            for (int i = 0; i < vSize && uvIndex < nv21.length; i++) {
-                nv21[uvIndex++] = vData[i];
-                if (i < uSize && uvIndex < nv21.length) {
-                    nv21[uvIndex++] = uData[i];
+                if (srcOffset < uSize && uvIndex < nv21.length) {
+                    nv21[uvIndex++] = uData[srcOffset];
                 }
             }
         }

library/src/main/java/org/wysaid/myUtils/FileUtil.java

@@ -32,6 +32,9 @@ public class FileUtil {
     public static void init(Context context) {
         if (context != null) {
             sAppContext = context.getApplicationContext();
+            // Invalidate the cached path so the next getPath() call re-resolves
+            // using the updated context (e.g. after switching from internal to external storage).
+            storagePath = null;
         }
     }
 

library/src/main/java/org/wysaid/myUtils/PermissionUtil.java

@@ -58,19 +58,22 @@ private static String[] getRequiredPermissions() {
     public static void verifyStoragePermissions(Activity activity) {
         try {
             String[] permissions = getRequiredPermissions();
+            java.util.List<String> missingPermissions = new java.util.ArrayList<>();
             StringBuilder toastText = null;
             for (int i = 0; i != permissions.length; ++i) {
                 int reqCode = ActivityCompat.checkSelfPermission(activity, permissions[i]);
                 if (reqCode != PackageManager.PERMISSION_GRANTED) {
+                    missingPermissions.add(permissions[i]);
                     if (toastText == null) {
                         toastText = new StringBuilder("Request permission");
                     }
                     toastText.append(" ").append(permissions[i]);
                 }
             }
-            if (toastText != null) {
+            if (toastText != null && !missingPermissions.isEmpty()) {
                 Toast.makeText(activity, toastText.toString(), Toast.LENGTH_LONG).show();
-                ActivityCompat.requestPermissions(activity, permissions, REQUEST_PERMISSION);
+                ActivityCompat.requestPermissions(activity,
+                        missingPermissions.toArray(new String[0]), REQUEST_PERMISSION);
             }
         } catch (Exception e) {
             Log.e(Common.LOG_TAG, "Error: " + e.getMessage());