adjust mediarecorderbuilder and use robolectric

packages/camera/camera/android/build.gradle

@@ -63,5 +63,5 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-inline:3.12.4'
     testImplementation 'androidx.test:core:1.3.0'
-    testImplementation 'org.robolectric:robolectric:4.3'
+    testImplementation 'org.robolectric:robolectric:4.6.1'
 }

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

@@ -201,7 +201,7 @@ private void prepareMediaRecorder(String outputFilePath) throws IOException {
             .getLockedCaptureOrientation();
 
     mediaRecorder =
-        new MediaRecorderBuilder(getRecordingProfile(), applicationContext, outputFilePath)
+        new MediaRecorderBuilder(getRecordingProfile(), outputFilePath)
             .setEnableAudio(enableAudio)
             .setMediaOrientation(
                 lockedOrientation == null

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/media/MediaRecorderBuilder.java

@@ -6,39 +6,54 @@
 
 import android.media.CamcorderProfile;
 import android.media.EncoderProfiles;
-import android.content.Context;
 import android.media.MediaRecorder;
+import android.os.Build;
 import androidx.annotation.NonNull;
 import java.io.IOException;
 
 public class MediaRecorderBuilder {
+  @SuppressWarnings("deprecation")
   static class MediaRecorderFactory {
-    MediaRecorder makeMediaRecorder(Context applicationContext) {
-      return new MediaRecorder(applicationContext);
+    MediaRecorder makeMediaRecorder() {
+      return new MediaRecorder();
     }
   }
 
   private final String outputFilePath;
-  private final EncoderProfiles recordingProfile;
+  private final CamcorderProfile camcorderProfile;
+  private final EncoderProfiles encoderProfiles;
   private final MediaRecorderFactory recorderFactory;
-  private final Context applicationContext;
 
   private boolean enableAudio;
   private int mediaOrientation;
 
   public MediaRecorderBuilder(
-      @NonNull EncoderProfiles recordingProfile, @NonNull Context applicationContext, @NonNull String outputFilePath) {
-    this(recordingProfile, applicationContext, outputFilePath, new MediaRecorderFactory());
+      @NonNull CamcorderProfile camcorderProfile, @NonNull String outputFilePath) {
+    this(camcorderProfile, outputFilePath, new MediaRecorderFactory());
   }
 
+  public MediaRecorderBuilder(
+    @NonNull EncoderProfiles encoderProfiles, @NonNull String outputFilePath) {
+  this(encoderProfiles, outputFilePath, new MediaRecorderFactory());
+}
+
   MediaRecorderBuilder(
-      @NonNull EncoderProfiles recordingProfile,
-      @NonNull Context applicationContext,
+    @NonNull CamcorderProfile camcorderProfile,
+    @NonNull String outputFilePath,
+    MediaRecorderFactory helper) {
+  this.outputFilePath = outputFilePath;
+  this.camcorderProfile = camcorderProfile;
+  this.encoderProfiles = null;
+  this.recorderFactory = helper;
+}
+
+  MediaRecorderBuilder(
+      @NonNull EncoderProfiles encoderProfiles,
       @NonNull String outputFilePath,
       MediaRecorderFactory helper) {
     this.outputFilePath = outputFilePath;
-    this.applicationContext = applicationContext;
-    this.recordingProfile = recordingProfile;
+    this.encoderProfiles = encoderProfiles;
+    this.camcorderProfile = null;
     this.recorderFactory = helper;
   }
 
@@ -53,33 +68,42 @@ public MediaRecorderBuilder setMediaOrientation(int orientation) {
   }
 
   public MediaRecorder build() throws IOException {
-    MediaRecorder mediaRecorder = recorderFactory.makeMediaRecorder(applicationContext);
-
-    EncoderProfiles.VideoProfile videoProfile = recordingProfile.getVideoProfiles().get(0);
-    EncoderProfiles.AudioProfile audioProfile = recordingProfile.getAudioProfiles().get(0);
+    MediaRecorder mediaRecorder = recorderFactory.makeMediaRecorder();
 
     // There's a fixed order that mediaRecorder expects. Only change these functions accordingly.
     // You can find the specifics here: https://developer.android.com/reference/android/media/MediaRecorder.
     if (enableAudio) mediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
     mediaRecorder.setVideoSource(MediaRecorder.VideoSource.SURFACE);
-    // mediaRecorder.setOutputFormat(recordingProfile.fileFormat);
-    mediaRecorder.setOutputFormat(recordingProfile.getRecommendedFileFormat());
-    if (enableAudio) {
-      // mediaRecorder.setAudioEncoder(recordingProfile.audioCodec);
+
+    if (Build.VERSION.SDK_INT >= 31) {
+      EncoderProfiles.VideoProfile videoProfile = encoderProfiles.getVideoProfiles().get(0);
+      EncoderProfiles.AudioProfile audioProfile = encoderProfiles.getAudioProfiles().get(0);
+
+      mediaRecorder.setOutputFormat(encoderProfiles.getRecommendedFileFormat());
+      if (enableAudio) { 
       mediaRecorder.setAudioEncoder(audioProfile.getCodec());
-      // mediaRecorder.setAudioEncodingBitRate(recordingProfile.audioBitRate);
       mediaRecorder.setAudioEncodingBitRate(audioProfile.getBitrate());
-      // mediaRecorder.setAudioSamplingRate(recordingProfile.audioSampleRate);
       mediaRecorder.setAudioSamplingRate(audioProfile.getSampleRate());
+      }
+      mediaRecorder.setVideoEncoder(videoProfile.getCodec());
+      mediaRecorder.setVideoEncodingBitRate(videoProfile.getBitrate());
+      mediaRecorder.setVideoFrameRate(videoProfile.getFrameRate());
+      mediaRecorder.setVideoSize(videoProfile.getWidth(), videoProfile.getHeight());
+      mediaRecorder.setVideoSize(videoProfile.getWidth(), videoProfile.getHeight());
     }
-    // mediaRecorder.setVideoEncoder(recordingProfile.videoCodec);
-    mediaRecorder.setVideoEncoder(videoProfile.getCodec());
-    // mediaRecorder.setVideoEncodingBitRate(recordingProfile.videoBitRate);
-    mediaRecorder.setVideoEncodingBitRate(videoProfile.getBitrate());
-    // mediaRecorder.setVideoFrameRate(recordingProfile.videoFrameRate);
-    mediaRecorder.setVideoFrameRate(videoProfile.getFrameRate());
-    // mediaRecorder.setVideoSize(recordingProfile.videoFrameWidth, recordingProfile.videoFrameHeight);
-    mediaRecorder.setVideoSize(videoProfile.getWidth(), videoProfile.getHeight());
+    else {
+    mediaRecorder.setOutputFormat(camcorderProfile.fileFormat);
+    if (enableAudio) {
+      mediaRecorder.setAudioEncoder(camcorderProfile.audioCodec);
+      mediaRecorder.setAudioEncodingBitRate(camcorderProfile.audioBitRate);
+      mediaRecorder.setAudioSamplingRate(camcorderProfile.audioSampleRate);
+    }
+    mediaRecorder.setVideoEncoder(camcorderProfile.videoCodec);
+    mediaRecorder.setVideoEncodingBitRate(camcorderProfile.videoBitRate);
+    mediaRecorder.setVideoFrameRate(camcorderProfile.videoFrameRate);
+    mediaRecorder.setVideoSize(camcorderProfile.videoFrameWidth, camcorderProfile.videoFrameHeight);
+    }
+
     mediaRecorder.setOutputFile(outputFilePath);
     mediaRecorder.setOrientationHint(this.mediaOrientation);
 

packages/camera/camera/android/src/test/java/io/flutter/plugins/camera/media/MediaRecorderBuilderTest.java

@@ -7,31 +7,77 @@
 import static org.junit.Assert.assertNotNull;
 import static org.mockito.Mockito.*;
 
-import android.content.Context;
 import android.media.CamcorderProfile;
 import android.media.EncoderProfiles;
 import android.media.MediaRecorder;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.util.List;
+import org.junit.runner.RunWith;
 import org.junit.Test;
 import org.mockito.InOrder;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
+@RunWith(RobolectricTestRunner.class)
 public class MediaRecorderBuilderTest {
+  @Config(maxSdk = 30)
+  @SuppressWarnings("deprecation")
   @Test
   public void ctor_test() {
-    Context mockApplicationContext = mock(Context.class);
     MediaRecorderBuilder builder =
-        new MediaRecorderBuilder(CamcorderProfile.getAll("0",CamcorderProfile.QUALITY_1080P), mockApplicationContext, "");
+        new MediaRecorderBuilder(CamcorderProfile.get(CamcorderProfile.QUALITY_1080P), "");
 
     assertNotNull(builder);
   }
 
+  @Config(minSdk = 31)
+  @Test
+  public void ctor_test_v31() {
+    MediaRecorderBuilder builder =
+        new MediaRecorderBuilder(CamcorderProfile.getAll("0",CamcorderProfile.QUALITY_1080P), "");
+
+    assertNotNull(builder);
+  }
+
+  @Config(maxSdk = 30)
+  @SuppressWarnings("deprecation")
   @Test
   public void build_shouldSetValuesInCorrectOrderWhenAudioIsDisabled() throws IOException {
-    // CamcorderProfile recorderProfile = getEmptyCamcorderProfile();
+    CamcorderProfile recorderProfile = getEmptyCamcorderProfile();
+    MediaRecorderBuilder.MediaRecorderFactory mockFactory =
+        mock(MediaRecorderBuilder.MediaRecorderFactory.class);
+    MediaRecorder mockMediaRecorder = mock(MediaRecorder.class);
+    String outputFilePath = "mock_video_file_path";
+    int mediaOrientation = 1;
+    MediaRecorderBuilder builder =
+        new MediaRecorderBuilder(recorderProfile, outputFilePath, mockFactory)
+            .setEnableAudio(false)
+            .setMediaOrientation(mediaOrientation);
+
+    when(mockFactory.makeMediaRecorder()).thenReturn(mockMediaRecorder);
+
+    MediaRecorder recorder = builder.build();
+
+    InOrder inOrder = inOrder(recorder);
+    inOrder.verify(recorder).setVideoSource(MediaRecorder.VideoSource.SURFACE);
+    inOrder.verify(recorder).setOutputFormat(recorderProfile.fileFormat);
+    inOrder.verify(recorder).setVideoEncoder(recorderProfile.videoCodec);
+    inOrder.verify(recorder).setVideoEncodingBitRate(recorderProfile.videoBitRate);
+    inOrder.verify(recorder).setVideoFrameRate(recorderProfile.videoFrameRate);
+    inOrder
+        .verify(recorder)
+        .setVideoSize(recorderProfile.videoFrameWidth, recorderProfile.videoFrameHeight);
+    inOrder.verify(recorder).setOutputFile(outputFilePath);
+    inOrder.verify(recorder).setOrientationHint(mediaOrientation);
+    inOrder.verify(recorder).prepare();
+  }
+
+  @Config(minSdk = 31)
+  @Test
+  public void build_shouldSetValuesInCorrectOrderWhenAudioIsDisabled_v31() throws IOException {
     EncoderProfiles recorderProfile = mock(EncoderProfiles.class);
-    Context mockApplicationContext = mock(Context.class);
     List<EncoderProfiles.VideoProfile> mockVideoProfiles = List.of(mock(EncoderProfiles.VideoProfile.class));
     List<EncoderProfiles.AudioProfile> mockAudioProfiles = List.of(mock(EncoderProfiles.AudioProfile.class));
     MediaRecorderBuilder.MediaRecorderFactory mockFactory =
@@ -40,11 +86,11 @@ public void build_shouldSetValuesInCorrectOrderWhenAudioIsDisabled() throws IOEx
     String outputFilePath = "mock_video_file_path";
     int mediaOrientation = 1;
     MediaRecorderBuilder builder =
-        new MediaRecorderBuilder(recorderProfile, mockApplicationContext, outputFilePath, mockFactory)
+        new MediaRecorderBuilder(recorderProfile, outputFilePath, mockFactory)
             .setEnableAudio(false)
             .setMediaOrientation(mediaOrientation);
 
-    when(mockFactory.makeMediaRecorder(mockApplicationContext)).thenReturn(mockMediaRecorder);
+    when(mockFactory.makeMediaRecorder()).thenReturn(mockMediaRecorder);
     when(recorderProfile.getVideoProfiles()).thenReturn(mockVideoProfiles);
     when(recorderProfile.getAudioProfiles()).thenReturn(mockAudioProfiles);
 
@@ -55,29 +101,60 @@ public void build_shouldSetValuesInCorrectOrderWhenAudioIsDisabled() throws IOEx
 
     InOrder inOrder = inOrder(recorder);
     inOrder.verify(recorder).setVideoSource(MediaRecorder.VideoSource.SURFACE);
-    // inOrder.verify(recorder).setOutputFormat(recorderProfile.fileFormat);
     inOrder.verify(recorder).setOutputFormat(recorderProfile.getRecommendedFileFormat());
-    // inOrder.verify(recorder).setVideoEncoder(recorderProfile.videoCodec);
     inOrder.verify(recorder).setVideoEncoder(videoProfile.getCodec());
-    // inOrder.verify(recorder).setVideoEncodingBitRate(recorderProfile.videoBitRate);
     inOrder.verify(recorder).setVideoEncodingBitRate(videoProfile.getBitrate());
-    // inOrder.verify(recorder).setVideoFrameRate(recorderProfile.videoFrameRate);
     inOrder.verify(recorder).setVideoFrameRate(videoProfile.getFrameRate());
-
     inOrder
         .verify(recorder)
         .setVideoSize(videoProfile.getWidth(), videoProfile.getHeight());
-        // .setVideoSize(recorderProfile.videoFrameWidth, recorderProfile.videoFrameHeight);
     inOrder.verify(recorder).setOutputFile(outputFilePath);
     inOrder.verify(recorder).setOrientationHint(mediaOrientation);
     inOrder.verify(recorder).prepare();
   }
 
+  @Config(maxSdk = 30)
+  @SuppressWarnings("deprecation")
   @Test
   public void build_shouldSetValuesInCorrectOrderWhenAudioIsEnabled() throws IOException {
-    // CamcorderProfile recorderProfile = getEmptyCamcorderProfile();
+    CamcorderProfile recorderProfile = getEmptyCamcorderProfile();
+    MediaRecorderBuilder.MediaRecorderFactory mockFactory =
+        mock(MediaRecorderBuilder.MediaRecorderFactory.class);
+    MediaRecorder mockMediaRecorder = mock(MediaRecorder.class);
+    String outputFilePath = "mock_video_file_path";
+    int mediaOrientation = 1;
+    MediaRecorderBuilder builder =
+        new MediaRecorderBuilder(recorderProfile, outputFilePath, mockFactory)
+            .setEnableAudio(true)
+            .setMediaOrientation(mediaOrientation);
+
+    when(mockFactory.makeMediaRecorder()).thenReturn(mockMediaRecorder);
+
+    MediaRecorder recorder = builder.build();
+
+    InOrder inOrder = inOrder(recorder);
+    inOrder.verify(recorder).setAudioSource(MediaRecorder.AudioSource.MIC);
+    inOrder.verify(recorder).setVideoSource(MediaRecorder.VideoSource.SURFACE);
+    inOrder.verify(recorder).setOutputFormat(recorderProfile.fileFormat);
+    inOrder.verify(recorder).setAudioEncoder(recorderProfile.audioCodec);
+    inOrder.verify(recorder).setAudioEncodingBitRate(recorderProfile.audioBitRate);
+    inOrder.verify(recorder).setAudioSamplingRate(recorderProfile.audioSampleRate);
+    inOrder.verify(recorder).setVideoEncoder(recorderProfile.videoCodec);
+    inOrder.verify(recorder).setVideoEncodingBitRate(recorderProfile.videoBitRate);
+    inOrder.verify(recorder).setVideoFrameRate(recorderProfile.videoFrameRate);
+    inOrder
+        .verify(recorder)
+        .setVideoSize(recorderProfile.videoFrameWidth, recorderProfile.videoFrameHeight);
+    inOrder.verify(recorder).setOutputFile(outputFilePath);
+    inOrder.verify(recorder).setOrientationHint(mediaOrientation);
+    inOrder.verify(recorder).prepare();
+  }
+
+  @Config(minSdk = 31)
+  @Test
+  public void build_shouldSetValuesInCorrectOrderWhenAudioIsEnabled_v31() throws IOException {
+    System.out.println(getEmptyCamcorderProfile());
     EncoderProfiles recorderProfile = mock(EncoderProfiles.class);
-    Context mockApplicationContext = mock(Context.class);
     List<EncoderProfiles.VideoProfile> mockVideoProfiles = List.of(mock(EncoderProfiles.VideoProfile.class));
     List<EncoderProfiles.AudioProfile> mockAudioProfiles = List.of(mock(EncoderProfiles.AudioProfile.class));
     MediaRecorderBuilder.MediaRecorderFactory mockFactory =
@@ -86,11 +163,11 @@ public void build_shouldSetValuesInCorrectOrderWhenAudioIsEnabled() throws IOExc
     String outputFilePath = "mock_video_file_path";
     int mediaOrientation = 1;
     MediaRecorderBuilder builder =
-        new MediaRecorderBuilder(recorderProfile, mockApplicationContext, outputFilePath, mockFactory)
+        new MediaRecorderBuilder(recorderProfile, outputFilePath, mockFactory)
             .setEnableAudio(true)
             .setMediaOrientation(mediaOrientation);
 
-    when(mockFactory.makeMediaRecorder(mockApplicationContext)).thenReturn(mockMediaRecorder);
+    when(mockFactory.makeMediaRecorder()).thenReturn(mockMediaRecorder);
     when(recorderProfile.getVideoProfiles()).thenReturn(mockVideoProfiles);
     when(recorderProfile.getAudioProfiles()).thenReturn(mockAudioProfiles);
 
@@ -102,24 +179,16 @@ public void build_shouldSetValuesInCorrectOrderWhenAudioIsEnabled() throws IOExc
     InOrder inOrder = inOrder(recorder);
     inOrder.verify(recorder).setAudioSource(MediaRecorder.AudioSource.MIC);
     inOrder.verify(recorder).setVideoSource(MediaRecorder.VideoSource.SURFACE);
-    // inOrder.verify(recorder).setOutputFormat(recorderProfile.fileFormat);
     inOrder.verify(recorder).setOutputFormat(recorderProfile.getRecommendedFileFormat());
-    // inOrder.verify(recorder).setAudioEncoder(recorderProfile.audioCodec);
     inOrder.verify(recorder).setAudioEncoder(audioProfile.getCodec());
-    // inOrder.verify(recorder).setAudioEncodingBitRate(recorderProfile.audioBitRate);
     inOrder.verify(recorder).setAudioEncodingBitRate(audioProfile.getBitrate());
-    // inOrder.verify(recorder).setAudioSamplingRate(recorderProfile.audioSampleRate);
     inOrder.verify(recorder).setAudioSamplingRate(audioProfile.getSampleRate());
-    // inOrder.verify(recorder).setVideoEncoder(recorderProfile.videoCodec);
     inOrder.verify(recorder).setVideoEncoder(videoProfile.getCodec());
-    // inOrder.verify(recorder).setVideoEncodingBitRate(recorderProfile.videoBitRate);
     inOrder.verify(recorder).setVideoEncodingBitRate(videoProfile.getBitrate());
-    // inOrder.verify(recorder).setVideoFrameRate(recorderProfile.videoFrameRate);
     inOrder.verify(recorder).setVideoFrameRate(videoProfile.getFrameRate());
     inOrder
         .verify(recorder)
         .setVideoSize(videoProfile.getWidth(), videoProfile.getHeight());
-        // .setVideoSize(recorderProfile.videoFrameWidth, recorderProfile.videoFrameHeight);
     inOrder.verify(recorder).setOutputFile(outputFilePath);
     inOrder.verify(recorder).setOrientationHint(mediaOrientation);
     inOrder.verify(recorder).prepare();

packages/camera/camera/example/android/gradle.properties

@@ -2,3 +2,4 @@ org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
 android.enableR8=true
+android.jetifier.blacklist=bcprov-jdk15on