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/stream_manager.h | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/android/hardware/aw/camera/3_4/stream_manager.h b/android/hardware/aw/camera/3_4/stream_manager.h
index 458372c..a7609a6 100755
--- a/android/hardware/aw/camera/3_4/stream_manager.h
+++ b/android/hardware/aw/camera/3_4/stream_manager.h
@@ -66,11 +66,12 @@
std::shared_ptr<V4L2Wrapper> device,
std::shared_ptr<V4L2Camera> camera);
CameraStream* createStream(STREAM_SERIAL ss,
- uint32_t width,
- uint32_t height,
- int format,
- uint32_t usage,
- int isBlob);
+ uint32_t width,
+ uint32_t height,
+ int format,
+ uint32_t usage,
+ int isBlob,
+ bool mergeStreamFlag);
int configurateManager(STREAM_SERIAL ss);
int start(STREAM_SERIAL ss);
int stop(STREAM_SERIAL ss);
@@ -219,6 +220,7 @@
std::unordered_map<uint32_t, int> mMapFrameNumRef;
std::mutex frameNumber_lock_;
std::condition_variable frameNumber_condition_;
+ int merge_stream_flag;
/* Defines possible states of the stream thread.
*/
--
Gitblit v1.6.2