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

liyujie

2025-08-28 d9927380ed7c8366f762049be9f3fee225860833

 android/hardware/aw/camera/3_4/v4l2_wrapper.h
..
..
@@ -66,10 +66,12 @@
66
66
   // Helper class to ensure all opened connections are closed.
67
67
   class Connection {
68
68
    public:
69
-    Connection(std::shared_ptr<V4L2Wrapper> device, STREAM_SERIAL ss)
69
+    Connection(std::shared_ptr<V4L2Wrapper> device,
70
+               STREAM_SERIAL ss,
71
+               int merge_status)
70
72
         : device_(std::move(device)),
71
73
           ss_(std::move(ss)),
72
-          connect_result_(device_->Connect(ss)) {}
74
+          connect_result_(device_->Connect(ss, merge_status)) {}
73
75
     ~Connection() {
74
76
       if (connect_result_ == 0) {
75
77
         device_->Disconnect(ss_);
..
..
@@ -95,7 +97,7 @@
95
97
 
96
98
   // Connect or disconnect to the device. Access by creating/destroying
97
99
   // a V4L2Wrapper::Connection object.
98
-  int Connect(STREAM_SERIAL ss);
100
+  int Connect(STREAM_SERIAL ss, int merge_status);
99
101
   void Disconnect(STREAM_SERIAL ss);
100
102
 
101
103
   std::unordered_map<std::string, android::base::unique_fd> map_stream_fd_;