commit af6098f5eb40041db425b2cd0f37f79d334e1bd7
author Treehugger Robot <treehugger-gerrit@google.com> Thu Feb 09 06:17:35 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 09 06:17:35 2023 +0000
tree 55af8faff0eb536834a2e15e2f99dcbc8d22284c
parent 72d335894a880abb3198d05f7b00ea76e528c087
parent 40923e56265e8aa16dc34fada11646e6c168a2b0

Merge "Reuse VideoCapture use case in CameraController" into androidx-main

camera/camera-view/src/main/java/androidx/camera/view/CameraController.java

diff --git a/camera/camera-view/src/main/java/androidx/camera/view/CameraController.java b/camera/camera-view/src/main/java/androidx/camera/view/CameraController.java
index 2ed53fc..3602e67 100644
--- a/camera/camera-view/src/main/java/androidx/camera/view/CameraController.java
+++ b/camera/camera-view/src/main/java/androidx/camera/view/CameraController.java
@@ -1435,6 +1435,7 @@
             return;
         }
         mVideoCaptureQuality = targetQuality;
+        unbindVideoAndRecreate();
         startCameraAndTrackStates();
     }
 
@@ -1450,6 +1451,16 @@
         return mVideoCaptureQuality;
     }
 
+    /**
+     * Unbinds VideoCapture and recreate with the latest parameters.
+     */
+    private void unbindVideoAndRecreate() {
+        if (isCameraInitialized()) {
+            mCameraProvider.unbind(mVideoCapture);
+        }
+        mVideoCapture = createNewVideoCapture();
+    }
+
     private VideoCapture<Recorder> createNewVideoCapture() {
         return VideoCapture.withOutput(generateVideoCaptureRecorder(mVideoCaptureQuality));
     }
@@ -2002,11 +2013,10 @@
             mCameraProvider.unbind(mImageAnalysis);
         }
 
-        // TODO: revert aosp/2280599 to reuse VideoCapture when VideoCapture supports reuse.
-        mCameraProvider.unbind(mVideoCapture);
         if (isVideoCaptureEnabled()) {
-            mVideoCapture = createNewVideoCapture();
             builder.addUseCase(mVideoCapture);
+        } else {
+            mCameraProvider.unbind(mVideoCapture);
         }
 
         builder.setViewPort(mViewPort);