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.h | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/android/hardware/aw/camera/3_4/stream_format.h b/android/hardware/aw/camera/3_4/stream_format.h
index 607ae1b..ff0b054 100755
--- a/android/hardware/aw/camera/3_4/stream_format.h
+++ b/android/hardware/aw/camera/3_4/stream_format.h
@@ -37,7 +37,7 @@
class StreamFormat {
public:
StreamFormat(int format, uint32_t width, uint32_t height);
- explicit StreamFormat(const v4l2_format& format);
+ StreamFormat(const v4l2_format& format, bool mergeStreamFlag);
virtual ~StreamFormat() = default;
// Only uint32_t members, use default generated copy and assign.
@@ -60,6 +60,7 @@
static uint32_t HalToV4L2PixelFormat(int hal_pixel_format);
// Returns -1 for unrecognized.
static int V4L2ToHalPixelFormat(uint32_t v4l2_pixel_format);
+ bool GetMergeStreamFlag();
private:
uint32_t type_;
@@ -69,6 +70,7 @@
uint32_t width_;
uint32_t height_;
uint32_t bytes_per_line_;
+ bool merge_stream_flag_;
};
} // namespace v4l2_camera_hal
--
Gitblit v1.6.2