.. | .. |
---|
73 | 73 | // Use this method to create V4L2Camera objects. Functionally equivalent |
---|
74 | 74 | // to "new V4L2Camera", except that it may return nullptr in case of failure. |
---|
75 | 75 | static V4L2Camera* NewV4L2Camera(int id, |
---|
76 | | - std::shared_ptr<CCameraConfig> pCameraCfg); |
---|
| 76 | + std::shared_ptr<CCameraConfig> pCameraCfg, |
---|
| 77 | + bool mergeStreamStatus); |
---|
77 | 78 | int setFlashTorchMode(bool enabled); |
---|
78 | 79 | int closeFlashTorch(); |
---|
79 | 80 | ~V4L2Camera(); |
---|
.. | .. |
---|
86 | 87 | V4L2Camera(int id, |
---|
87 | 88 | std::shared_ptr<V4L2Wrapper> v4l2_wrapper, |
---|
88 | 89 | std::unique_ptr<Metadata> metadata, |
---|
89 | | - std::shared_ptr<CCameraConfig> pCameraCfg); |
---|
| 90 | + std::shared_ptr<CCameraConfig> pCameraCfg, |
---|
| 91 | + bool mergeStreamStatus); |
---|
90 | 92 | |
---|
91 | 93 | // default_camera_hal::Camera virtual methods. |
---|
92 | 94 | // Connect to the device: open dev nodes, etc. |
---|
.. | .. |
---|
380 | 382 | |
---|
381 | 383 | bool mStreamTracker[MAX_STREAM]; |
---|
382 | 384 | bool mSourceStreamTracker[MAX_STREAM]; |
---|
| 385 | + bool merge_stream_status_; |
---|
| 386 | + bool is_merge_stream_flag; |
---|
383 | 387 | |
---|
384 | 388 | DISALLOW_COPY_AND_ASSIGN(V4L2Camera); |
---|
385 | 389 | }; |
---|