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/allwinnertech/libAWIspApi/libisp_new/include/V4l2Camera/sunxi_camera_v2.h | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/android/hardware/aw/camera/3_4/allwinnertech/libAWIspApi/libisp_new/include/V4l2Camera/sunxi_camera_v2.h b/android/hardware/aw/camera/3_4/allwinnertech/libAWIspApi/libisp_new/include/V4l2Camera/sunxi_camera_v2.h
index 9ada022..c656c03 100755
--- a/android/hardware/aw/camera/3_4/allwinnertech/libAWIspApi/libisp_new/include/V4l2Camera/sunxi_camera_v2.h
+++ b/android/hardware/aw/camera/3_4/allwinnertech/libAWIspApi/libisp_new/include/V4l2Camera/sunxi_camera_v2.h
@@ -186,6 +186,10 @@
__s32 reserved[16];
};
+struct dma_merge {
+ __u8 en;
+};
+
struct vin_top_clk {
__u32 clk_rate;
};
@@ -212,6 +216,11 @@
__u32 ptn_type;
};
+struct buf_merge {
+ __u8 en;
+ __u8 buffer_num;
+};
+
#define VIDIOC_ISP_AE_STAT_REQ \
_IOWR('V', BASE_VIDIOC_PRIVATE + 1, struct isp_stat_buf)
#define VIDIOC_ISP_HIST_STAT_REQ \
@@ -230,11 +239,14 @@
_IOWR('V', BASE_VIDIOC_PRIVATE + 8, struct isp_hdr_ctrl)
#define VIDIOC_SYNC_CTRL \
_IOWR('V', BASE_VIDIOC_PRIVATE + 9, struct csi_sync_ctrl)
+#define VIDIOC_SET_DMA_MERGE \
+ _IOWR('V', BASE_VIDIOC_PRIVATE + 14, struct dma_merge)
#define VIDIOC_ISP_DEBUG \
_IOWR('V', BASE_VIDIOC_PRIVATE + 10, struct isp_debug_mode)
#define VIDIOC_VIN_PTN_CFG \
_IOWR('V', BASE_VIDIOC_PRIVATE + 11, struct vin_pattern_config)
-
+#define VIDIOC_SET_BUFFER_MERGE \
+ _IOWR('V', BASE_VIDIOC_PRIVATE + 15, struct buf_merge)
/*
* Events
*
--
Gitblit v1.6.2