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_format.cpp | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/android/hardware/aw/camera/3_4/stream_format.cpp b/android/hardware/aw/camera/3_4/stream_format.cpp
index 2f47f99..4f37a4d 100755
--- a/android/hardware/aw/camera/3_4/stream_format.cpp
+++ b/android/hardware/aw/camera/3_4/stream_format.cpp
@@ -35,7 +35,7 @@
// because the drivers return this one.
bytes_per_line_(width) {}
-StreamFormat::StreamFormat(const v4l2_format& format)
+StreamFormat::StreamFormat(const v4l2_format& format, bool mergeStreamFlag)
// be compatibility with multiplanar and single planar.
: type_(format.type),
memory_(V4L2_MEMORY_MMAP),
@@ -44,7 +44,8 @@
v4l2_pixel_format_(format.fmt.pix_mp.pixelformat),
width_(format.fmt.pix_mp.width),
height_(format.fmt.pix_mp.height),
- bytes_per_line_(format.fmt.pix_mp.width) {}
+ bytes_per_line_(format.fmt.pix_mp.width),
+ merge_stream_flag_(mergeStreamFlag){}
void StreamFormat::FillFormatRequest(v4l2_format* format) const {
memset(format, 0, sizeof(*format));
@@ -164,4 +165,8 @@
return v4l2_pixel_format;
}
+bool StreamFormat::GetMergeStreamFlag() {
+ return merge_stream_flag_;
+}
+
} // namespace v4l2_camera_hal
--
Gitblit v1.6.2