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

liyujie

2025-08-28 d9927380ed7c8366f762049be9f3fee225860833

 android/hardware/aw/camera/3_4/stream_format.cpp
..
..
@@ -35,7 +35,7 @@
35
35
       // because the drivers return this one.
36
36
       bytes_per_line_(width) {}
37
37
 
38
-StreamFormat::StreamFormat(const v4l2_format& format)
38
+StreamFormat::StreamFormat(const v4l2_format& format, bool mergeStreamFlag)
39
39
     // be compatibility with multiplanar and single planar.
40
40
     : type_(format.type),
41
41
       memory_(V4L2_MEMORY_MMAP),
..
..
@@ -44,7 +44,8 @@
44
44
       v4l2_pixel_format_(format.fmt.pix_mp.pixelformat),
45
45
       width_(format.fmt.pix_mp.width),
46
46
       height_(format.fmt.pix_mp.height),
47
-      bytes_per_line_(format.fmt.pix_mp.width) {}
47
+      bytes_per_line_(format.fmt.pix_mp.width),
48
+      merge_stream_flag_(mergeStreamFlag){}
48
49
 
49
50
 void StreamFormat::FillFormatRequest(v4l2_format* format) const {
50
51
   memset(format, 0, sizeof(*format));
..
..
@@ -164,4 +165,8 @@
164
165
   return v4l2_pixel_format;
165
166
 }
166
167
 
168
+bool StreamFormat::GetMergeStreamFlag() {
169
+  return merge_stream_flag_;
170
+}
171
+
167
172
 }  // namespace v4l2_camera_hal