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_hal.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/android/hardware/aw/camera/3_4/v4l2_camera_hal.h b/android/hardware/aw/camera/3_4/v4l2_camera_hal.h
index 1f34a20..0fa43b0 100755
--- a/android/hardware/aw/camera/3_4/v4l2_camera_hal.h
+++ b/android/hardware/aw/camera/3_4/v4l2_camera_hal.h
@@ -72,7 +72,7 @@
   // Callback handle.
   const camera_module_callbacks_t* mCallbacks;
   std::vector<std::shared_ptr<CCameraConfig>> mCameraConfig;
-
+  bool hal_merge_stream_flag;
   DISALLOW_COPY_AND_ASSIGN(V4L2CameraHAL);
 };
 

--
Gitblit v1.6.2