liyujie
2025-08-28 d9927380ed7c8366f762049be9f3fee225860833
android/hardware/aw/camera/3_4/v4l2_camera.h
....@@ -73,7 +73,8 @@
7373 // Use this method to create V4L2Camera objects. Functionally equivalent
7474 // to "new V4L2Camera", except that it may return nullptr in case of failure.
7575 static V4L2Camera* NewV4L2Camera(int id,
76
- std::shared_ptr<CCameraConfig> pCameraCfg);
76
+ std::shared_ptr<CCameraConfig> pCameraCfg,
77
+ bool mergeStreamStatus);
7778 int setFlashTorchMode(bool enabled);
7879 int closeFlashTorch();
7980 ~V4L2Camera();
....@@ -86,7 +87,8 @@
8687 V4L2Camera(int id,
8788 std::shared_ptr<V4L2Wrapper> v4l2_wrapper,
8889 std::unique_ptr<Metadata> metadata,
89
- std::shared_ptr<CCameraConfig> pCameraCfg);
90
+ std::shared_ptr<CCameraConfig> pCameraCfg,
91
+ bool mergeStreamStatus);
9092
9193 // default_camera_hal::Camera virtual methods.
9294 // Connect to the device: open dev nodes, etc.
....@@ -380,6 +382,8 @@
380382
381383 bool mStreamTracker[MAX_STREAM];
382384 bool mSourceStreamTracker[MAX_STREAM];
385
+ bool merge_stream_status_;
386
+ bool is_merge_stream_flag;
383387
384388 DISALLOW_COPY_AND_ASSIGN(V4L2Camera);
385389 };