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_wrapper.h | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/android/hardware/aw/camera/3_4/v4l2_wrapper.h b/android/hardware/aw/camera/3_4/v4l2_wrapper.h
index c80a1f1..245b99f 100755
--- a/android/hardware/aw/camera/3_4/v4l2_wrapper.h
+++ b/android/hardware/aw/camera/3_4/v4l2_wrapper.h
@@ -66,10 +66,12 @@
// Helper class to ensure all opened connections are closed.
class Connection {
public:
- Connection(std::shared_ptr<V4L2Wrapper> device, STREAM_SERIAL ss)
+ Connection(std::shared_ptr<V4L2Wrapper> device,
+ STREAM_SERIAL ss,
+ int merge_status)
: device_(std::move(device)),
ss_(std::move(ss)),
- connect_result_(device_->Connect(ss)) {}
+ connect_result_(device_->Connect(ss, merge_status)) {}
~Connection() {
if (connect_result_ == 0) {
device_->Disconnect(ss_);
@@ -95,7 +97,7 @@
// Connect or disconnect to the device. Access by creating/destroying
// a V4L2Wrapper::Connection object.
- int Connect(STREAM_SERIAL ss);
+ int Connect(STREAM_SERIAL ss, int merge_status);
void Disconnect(STREAM_SERIAL ss);
std::unordered_map<std::string, android::base::unique_fd> map_stream_fd_;
--
Gitblit v1.6.2