From d9927380ed7c8366f762049be9f3fee225860833 Mon Sep 17 00:00:00 2001
From: liyujie <2352380935@qq.com>
Date: Thu, 28 Aug 2025 12:04:16 +0000
Subject: [PATCH] [2/4]解决USB摄像头打开相机预览界面绿屏
---
android/hardware/aw/camera/3_4/v4l2_camera.h | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/android/hardware/aw/camera/3_4/v4l2_camera.h b/android/hardware/aw/camera/3_4/v4l2_camera.h
index 5e1af27..04ca9bc 100755
--- a/android/hardware/aw/camera/3_4/v4l2_camera.h
+++ b/android/hardware/aw/camera/3_4/v4l2_camera.h
@@ -73,7 +73,8 @@
// Use this method to create V4L2Camera objects. Functionally equivalent
// to "new V4L2Camera", except that it may return nullptr in case of failure.
static V4L2Camera* NewV4L2Camera(int id,
- std::shared_ptr<CCameraConfig> pCameraCfg);
+ std::shared_ptr<CCameraConfig> pCameraCfg,
+ bool mergeStreamStatus);
int setFlashTorchMode(bool enabled);
int closeFlashTorch();
~V4L2Camera();
@@ -86,7 +87,8 @@
V4L2Camera(int id,
std::shared_ptr<V4L2Wrapper> v4l2_wrapper,
std::unique_ptr<Metadata> metadata,
- std::shared_ptr<CCameraConfig> pCameraCfg);
+ std::shared_ptr<CCameraConfig> pCameraCfg,
+ bool mergeStreamStatus);
// default_camera_hal::Camera virtual methods.
// Connect to the device: open dev nodes, etc.
@@ -380,6 +382,8 @@
bool mStreamTracker[MAX_STREAM];
bool mSourceStreamTracker[MAX_STREAM];
+ bool merge_stream_status_;
+ bool is_merge_stream_flag;
DISALLOW_COPY_AND_ASSIGN(V4L2Camera);
};
--
Gitblit v1.6.2