[4/4]解决USB摄像头打开相机预览界面绿屏

liyujie

2025-08-28 786ff4f4ca2374bdd9177f2e24b503d43e7a3b93

 android/packages/apps/Camera2/src/com/android/camera/settings/PictureSizeLoader.java
old mode 100755new mode 100644
..
..
@@ -49,17 +49,22 @@
49
49
     public static class PictureSizes {
50
50
         public final List<Size> backCameraSizes;
51
51
         public final List<Size> frontCameraSizes;
52
+        public final List<Size> externalCameraSizes;
52
53
         public final Optional<SelectedVideoQualities> videoQualitiesBack;
53
54
         public final Optional<SelectedVideoQualities> videoQualitiesFront;
54
-
55
+        public final Optional<SelectedVideoQualities> videoQualitiesExternal;
55
56
         PictureSizes(List<Size> backCameraSizes,
56
57
                 List<Size> frontCameraSizes,
58
+                List<Size> externalCameraSizes,
57
59
                 Optional<SelectedVideoQualities> videoQualitiesBack,
58
-                Optional<SelectedVideoQualities> videoQualitiesFront) {
60
+                Optional<SelectedVideoQualities> videoQualitiesFront,
61
+                Optional<SelectedVideoQualities> videoQualitiesExternal) {
59
62
             this.backCameraSizes = backCameraSizes;
60
63
             this.frontCameraSizes = frontCameraSizes;
64
+            this.externalCameraSizes = externalCameraSizes;
61
65
             this.videoQualitiesBack = videoQualitiesBack;
62
66
             this.videoQualitiesFront = videoQualitiesFront;
67
+            this.videoQualitiesExternal = videoQualitiesExternal;
63
68
         }
64
69
     }
65
70
 
..
..
@@ -111,17 +116,24 @@
111
116
      * We then calculate the resolutions that should be available and in the end
112
117
      * filter it in case a resolution is on the blacklist for this device.
113
118
      */
119
+
114
120
     public PictureSizes computePictureSizes() {
115
121
         List<Size> backCameraSizes = computeSizesForCamera(SettingsUtil.CAMERA_FACING_BACK);
116
122
         List<Size> frontCameraSizes = computeSizesForCamera(SettingsUtil.CAMERA_FACING_FRONT);
123
+        List<Size> externalCameraSizes = computeSizesForCamera(SettingsUtil.CAMERA_FACING_EXTERNAL);
117
124
         Optional<SelectedVideoQualities> videoQualitiesBack =
118
-                computeQualitiesForCamera(SettingsUtil.CAMERA_FACING_BACK);
125
+            computeQualitiesForCamera(SettingsUtil.CAMERA_FACING_BACK);
119
126
         Optional<SelectedVideoQualities> videoQualitiesFront =
120
-                computeQualitiesForCamera(SettingsUtil.CAMERA_FACING_FRONT);
121
-        return new PictureSizes(backCameraSizes, frontCameraSizes, videoQualitiesBack,
122
-                videoQualitiesFront);
127
+            computeQualitiesForCamera(SettingsUtil.CAMERA_FACING_FRONT);
128
+        Optional<SelectedVideoQualities> videoQualitiesExternal =
129
+            computeQualitiesForCamera(SettingsUtil.CAMERA_FACING_EXTERNAL);
130
+        return new PictureSizes(backCameraSizes, frontCameraSizes, externalCameraSizes,
131
+                videoQualitiesBack,
132
+                videoQualitiesFront,
133
+                videoQualitiesExternal);
123
134
     }
124
135
 
136
+
125
137
     private List<Size> computeSizesForCamera(CameraDeviceSelector facingSelector) {
126
138
         List<Size> sizes;
127
139
         int cameraId = SettingsUtil.getCameraId(mCameraDeviceInfo, facingSelector);