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

liyujie

2025-08-28 d9927380ed7c8366f762049be9f3fee225860833

 android/hardware/aw/camera/3_4/stream_manager.h
..
..
@@ -66,11 +66,12 @@
66
66
       std::shared_ptr<V4L2Wrapper> device,
67
67
       std::shared_ptr<V4L2Camera> camera);
68
68
   CameraStream* createStream(STREAM_SERIAL ss,
69
-                             uint32_t width,
70
-                             uint32_t height,
71
-                             int      format,
72
-                             uint32_t usage,
73
-                             int      isBlob);
69
+                             uint32_t      width,
70
+                             uint32_t      height,
71
+                             int           format,
72
+                             uint32_t      usage,
73
+                             int           isBlob,
74
+                             bool          mergeStreamFlag);
74
75
   int configurateManager(STREAM_SERIAL ss);
75
76
   int start(STREAM_SERIAL ss);
76
77
   int stop(STREAM_SERIAL ss);
..
..
@@ -219,6 +220,7 @@
219
220
   std::unordered_map<uint32_t, int> mMapFrameNumRef;
220
221
   std::mutex frameNumber_lock_;
221
222
   std::condition_variable frameNumber_condition_;
223
+  int merge_stream_flag;
222
224
 
223
225
   /* Defines possible states of the stream thread.
224
226
    */