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/camera_stream.h | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/android/hardware/aw/camera/3_4/camera_stream.h b/android/hardware/aw/camera/3_4/camera_stream.h
index 818cc3f..5eb5d82 100755
--- a/android/hardware/aw/camera/3_4/camera_stream.h
+++ b/android/hardware/aw/camera/3_4/camera_stream.h
@@ -118,8 +118,9 @@
virtual int flush();
virtual int initialize(uint32_t width,
uint32_t height,
- int format,
- uint32_t usage);
+ int format,
+ uint32_t usage,
+ bool mergeStreamFlag);
virtual int setFormat(uint32_t width,
uint32_t height,
int format,
@@ -183,7 +184,11 @@
int start();
int stop();
int flush();
- int initialize(uint32_t width, uint32_t height, int format, uint32_t usage);
+ int initialize(uint32_t width,
+ uint32_t height,
+ int format,
+ uint32_t usage,
+ bool mergeStreamFlag);
int setFormat(uint32_t width, uint32_t height, int format, uint32_t usage);
int getBuffer(buffer_handle_t ** buffer, uint32_t* frameNumber);
int waitBuffer();
@@ -211,7 +216,11 @@
int start();
int stop();
int flush();
- int initialize(uint32_t width, uint32_t height, int format, uint32_t usage);
+ int initialize(uint32_t width,
+ uint32_t height,
+ int format,
+ uint32_t usage,
+ bool mergeStreamFlag);
int setFormat(uint32_t width, uint32_t height, int format, uint32_t usage);
int getBuffer(buffer_handle_t** buffer, uint32_t* frameNumber);
int waitBuffer();
@@ -242,7 +251,11 @@
int start();
int stop();
int flush();
- int initialize(uint32_t width, uint32_t height, int format, uint32_t usage);
+ int initialize(uint32_t width,
+ uint32_t height,
+ int format,
+ uint32_t usage,
+ bool mergeStreamFlag);
int setFormat(uint32_t width, uint32_t height, int format, uint32_t usage);
int getBuffer(buffer_handle_t** buffer, uint32_t* frameNumber);
int waitBuffer();
@@ -269,7 +282,11 @@
int start();
int stop();
int flush();
- int initialize(uint32_t width, uint32_t height, int format, uint32_t usage);
+ int initialize(uint32_t width,
+ uint32_t height,
+ int format,
+ uint32_t usage,
+ bool mergeStreamFlag);
int setScaleFlag();
int setFormat(uint32_t width, uint32_t height, int format, uint32_t usage);
int getBuffer(buffer_handle_t** buffer, uint32_t* frameNumber);
--
Gitblit v1.6.2