[camera_platform_interface] [camera] [camera_android] Add NV21 as an image stream format

packages/camera/camera/CHANGELOG.md

@@ -1,5 +1,6 @@
-## NEXT
+## 0.10.4
 
+* Adds NV21 as an image streaming option for Android.
 * Updates minimum Flutter version to 3.3.
 * Aligns Dart and Flutter SDK constraints.
 

packages/camera/camera/example/pubspec.yaml

@@ -30,3 +30,10 @@ dev_dependencies:
 
 flutter:
   uses-material-design: true
+
+# FOR TESTING ONLY. DO NOT MERGE.
+dependency_overrides:
+  camera_android:
+    path: ../../../camera/camera_android
+  camera_platform_interface:
+    path: ../../../camera/camera_platform_interface

packages/camera/camera/lib/src/camera_image.dart

@@ -90,6 +90,9 @@ ImageFormatGroup _asImageFormatGroup(dynamic rawFormat) {
       // android.graphics.ImageFormat.JPEG
       case 256:
         return ImageFormatGroup.jpeg;
+      // android.graphics.ImageFormat.NV21
+      case 17:
+        return ImageFormatGroup.nv21;
     }
   }
 

packages/camera/camera/pubspec.yaml

@@ -4,7 +4,7 @@ description: A Flutter plugin for controlling the camera. Supports previewing
   Dart.
 repository: https://github.com/flutter/packages/tree/main/packages/camera/camera
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.10.3+2
+version: 0.10.4
 
 environment:
   sdk: ">=2.18.0 <4.0.0"
@@ -38,3 +38,10 @@ dev_dependencies:
   mockito: 5.4.0
   plugin_platform_interface: ^2.0.0
   video_player: ^2.0.0
+
+# FOR TESTING ONLY. DO NOT MERGE.
+dependency_overrides:
+  camera_android:
+    path: ../../camera/camera_android
+  camera_platform_interface:
+    path: ../../camera/camera_platform_interface

packages/camera/camera/test/camera_image_test.dart

@@ -139,12 +139,12 @@ void main() {
       expect(cameraImage.format.group, ImageFormatGroup.yuv420);
     });
 
-    test('$CameraImage has ImageFormatGroup.bgra8888 for iOS', () {
-      debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
+    test('$CameraImage has ImageFormatGroup.nv21 for android', () {
+      debugDefaultTargetPlatformOverride = TargetPlatform.android;
 
       final CameraImage cameraImage =
           CameraImage.fromPlatformData(<dynamic, dynamic>{
-        'format': 1111970369,
+        'format': 17,
         'height': 1,
         'width': 4,
         'lensAperture': 1.8,
@@ -160,7 +160,7 @@ void main() {
           }
         ]
       });
-      expect(cameraImage.format.group, ImageFormatGroup.bgra8888);
+      expect(cameraImage.format.group, ImageFormatGroup.nv21);
     });
     test('$CameraImage has ImageFormatGroup.unknown', () {
       final CameraImage cameraImage =

packages/camera/camera_android/CHANGELOG.md

@@ -1,5 +1,7 @@
 ## 0.10.5
 
+* Adds support for NV21 as a new streaming format in Android which includes correct handling of image padding when present.
+
 * Allows camera to be switched while video recording.
 ## 0.10.4+3
 

packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/Camera.java

@@ -21,7 +21,6 @@
 import android.hardware.camera2.params.SessionConfiguration;
 import android.media.CamcorderProfile;
 import android.media.EncoderProfiles;
-import android.media.Image;
 import android.media.ImageReader;
 import android.media.MediaRecorder;
 import android.os.Build;
@@ -58,19 +57,18 @@
 import io.flutter.plugins.camera.features.resolution.ResolutionPreset;
 import io.flutter.plugins.camera.features.sensororientation.DeviceOrientationManager;
 import io.flutter.plugins.camera.features.zoomlevel.ZoomLevelFeature;
+import io.flutter.plugins.camera.media.ImageStreamReader;
 import io.flutter.plugins.camera.media.MediaRecorderBuilder;
 import io.flutter.plugins.camera.types.CameraCaptureProperties;
 import io.flutter.plugins.camera.types.CaptureTimeoutsWrapper;
 import io.flutter.view.TextureRegistry.SurfaceTextureEntry;
 import java.io.File;
 import java.io.IOException;
-import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.concurrent.Executors;
 
 @FunctionalInterface
@@ -90,6 +88,7 @@ class Camera
     supportedImageFormats = new HashMap<>();
     supportedImageFormats.put("yuv420", ImageFormat.YUV_420_888);
     supportedImageFormats.put("jpeg", ImageFormat.JPEG);
+    supportedImageFormats.put("nv21", ImageFormat.NV21);
   }
 
   /**
@@ -131,7 +130,7 @@ class Camera
   private CameraDeviceWrapper cameraDevice;
   private CameraCaptureSession captureSession;
   private ImageReader pictureImageReader;
-  private ImageReader imageStreamReader;
+  private ImageStreamReader imageStreamReader;
   /** {@link CaptureRequest.Builder} for the camera preview */
   private CaptureRequest.Builder previewRequestBuilder;
 
@@ -305,7 +304,7 @@ public void open(String imageFormatGroup) throws CameraAccessException {
       imageFormat = ImageFormat.YUV_420_888;
     }
     imageStreamReader =
-        ImageReader.newInstance(
+        new ImageStreamReader(
             resolutionFeature.getPreviewSize().getWidth(),
             resolutionFeature.getPreviewSize().getHeight(),
             imageFormat,
@@ -534,7 +533,7 @@ private void startCapture(boolean record, boolean stream) throws CameraAccessExc
       surfaces.add(mediaRecorder.getSurface());
       successCallback = () -> mediaRecorder.start();
     }
-    if (stream) {
+    if (stream && imageStreamReader != null) {
       surfaces.add(imageStreamReader.getSurface());
     }
 
@@ -1189,49 +1188,21 @@ public void onListen(Object o, EventChannel.EventSink imageStreamSink) {
 
           @Override
           public void onCancel(Object o) {
-            imageStreamReader.setOnImageAvailableListener(null, backgroundHandler);
+            if (imageStreamReader == null) {
+              return;
+            }
+
+            imageStreamReader.removeListener(backgroundHandler);
           }
         });
   }
 
   private void setImageStreamImageAvailableListener(final EventChannel.EventSink imageStreamSink) {
-    imageStreamReader.setOnImageAvailableListener(
-        reader -> {
-          Image img = reader.acquireNextImage();
-          // Use acquireNextImage since image reader is only for one image.
-          if (img == null) return;
-
-          List<Map<String, Object>> planes = new ArrayList<>();
-          for (Image.Plane plane : img.getPlanes()) {
-            ByteBuffer buffer = plane.getBuffer();
-
-            byte[] bytes = new byte[buffer.remaining()];
-            buffer.get(bytes, 0, bytes.length);
-
-            Map<String, Object> planeBuffer = new HashMap<>();
-            planeBuffer.put("bytesPerRow", plane.getRowStride());
-            planeBuffer.put("bytesPerPixel", plane.getPixelStride());
-            planeBuffer.put("bytes", bytes);
-
-            planes.add(planeBuffer);
-          }
+    if (imageStreamReader == null) {
+      return;
+    }
 
-          Map<String, Object> imageBuffer = new HashMap<>();
-          imageBuffer.put("width", img.getWidth());
-          imageBuffer.put("height", img.getHeight());
-          imageBuffer.put("format", img.getFormat());
-          imageBuffer.put("planes", planes);
-          imageBuffer.put("lensAperture", this.captureProps.getLastLensAperture());
-          imageBuffer.put("sensorExposureTime", this.captureProps.getLastSensorExposureTime());
-          Integer sensorSensitivity = this.captureProps.getLastSensorSensitivity();
-          imageBuffer.put(
-              "sensorSensitivity", sensorSensitivity == null ? null : (double) sensorSensitivity);
-
-          final Handler handler = new Handler(Looper.getMainLooper());
-          handler.post(() -> imageStreamSink.success(imageBuffer));
-          img.close();
-        },
-        backgroundHandler);
+    imageStreamReader.subscribeListener(this.captureProps, imageStreamSink, backgroundHandler);
   }
 
   private void closeCaptureSession() {