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

liyujie

2025-08-28 d9927380ed7c8366f762049be9f3fee225860833

 android/hardware/aw/camera/3_4/stream_format.h
..
..
@@ -37,7 +37,7 @@
37
37
 class StreamFormat {
38
38
  public:
39
39
   StreamFormat(int format, uint32_t width, uint32_t height);
40
-  explicit StreamFormat(const v4l2_format& format);
40
+  StreamFormat(const v4l2_format& format, bool mergeStreamFlag);
41
41
   virtual ~StreamFormat() = default;
42
42
   // Only uint32_t members, use default generated copy and assign.
43
43
 
..
..
@@ -60,6 +60,7 @@
60
60
   static uint32_t HalToV4L2PixelFormat(int hal_pixel_format);
61
61
   // Returns -1 for unrecognized.
62
62
   static int V4L2ToHalPixelFormat(uint32_t v4l2_pixel_format);
63
+  bool GetMergeStreamFlag();
63
64
 
64
65
  private:
65
66
   uint32_t type_;
..
..
@@ -69,6 +70,7 @@
69
70
   uint32_t width_;
70
71
   uint32_t height_;
71
72
   uint32_t bytes_per_line_;
73
+  bool     merge_stream_flag_;
72
74
 };
73
75
 
74
76
 }  // namespace v4l2_camera_hal