From ce37159380ff1ae55da90b7c04bb87379e94b5b2 Mon Sep 17 00:00:00 2001
From: hmz007 <hmz007@gmail.com>
Date: Thu, 12 Dec 2024 17:34:45 +0800
Subject: [PATCH] device: update external camera config for nanopi6

 - add 4k60p support for hdmi in
 - set CameraIdOffset to 100 for hdmi in
 - set CameraIdOffset to 101 for external_camera (usb)

Signed-off-by: hmz007 <hmz007@gmail.com>
---
 device/rockchip/rk3588/nanopi6/device.mk      |  5 ++
 .../rk3588/nanopi6/external_camera_config.xml |  1 +
 .../rockchip/rk3588/nanopi6/hdmi_config.xml   | 54 +++++++++++++++++++
 .../etc/external_camera_config.xml            |  5 +-
 4 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 device/rockchip/rk3588/nanopi6/hdmi_config.xml

diff --git a/device/rockchip/rk3588/nanopi6/device.mk b/device/rockchip/rk3588/nanopi6/device.mk
index 9cedc527dfd..c193d569556 100644
--- a/device/rockchip/rk3588/nanopi6/device.mk
+++ b/device/rockchip/rk3588/nanopi6/device.mk
@@ -43,6 +43,11 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.vendor.init_usb=1
 
+ifeq ($(CAMERA_SUPPORT_HDMI),true)
+PRODUCT_COPY_FILES += \
+    device/rockchip/rk3588/nanopi6/hdmi_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/hdmi_config.xml
+endif
+
 # Inherit from those products. Most specific first.
 $(call inherit-product, device/rockchip/rk3588/device.mk)
 $(call inherit-product, device/rockchip/common/device.mk)
diff --git a/device/rockchip/rk3588/nanopi6/external_camera_config.xml b/device/rockchip/rk3588/nanopi6/external_camera_config.xml
index 8c040f3f10b..65ab5c0783e 100644
--- a/device/rockchip/rk3588/nanopi6/external_camera_config.xml
+++ b/device/rockchip/rk3588/nanopi6/external_camera_config.xml
@@ -3,6 +3,7 @@
         <ignore> <!-- Internal video devices to be ignored by external camera HAL -->
         <!-- <id>0</id> -->  <!-- No leading/trailing spaces -->
         </ignore>
+        <CameraIdOffset>101</CameraIdOffset>
     </Provider>
     <!-- See ExternalCameraUtils.cpp for default values of Device configurations below-->
     <Device>
diff --git a/device/rockchip/rk3588/nanopi6/hdmi_config.xml b/device/rockchip/rk3588/nanopi6/hdmi_config.xml
new file mode 100644
index 00000000000..41d6f65dbf4
--- /dev/null
+++ b/device/rockchip/rk3588/nanopi6/hdmi_config.xml
@@ -0,0 +1,54 @@
+<ExternalCamera>
+    <Provider>
+        <ignore> <!-- Internal video devices to be ignored by external camera HAL -->
+        <!-- <id>0</id> -->  <!-- No leading/trailing spaces -->
+        </ignore>
+        <CameraIdOffset>100</CameraIdOffset>
+    </Provider>
+    <!-- See ExternalCameraUtils.cpp for default values of Device configurations below-->
+    <Device>
+        <!-- Max JPEG buffer size in bytes-->
+        <MaxJpegBufferSize  bytes="12582912"/>  <!-- 12MB (~= 2160p YUV420) -->
+        <!-- Size of v4l2 buffer queue when streaming >= 30fps -->
+        <!-- Larger value: more request can be cached pipeline (less janky) -->
+        <!-- Smaller value: use less memory -->
+        <NumVideoBuffers  count="4"/>
+        <!-- Size of v4l2 buffer queue when streaming < 30fps -->
+        <NumStillBuffers  count="2"/>
+        <!-- List of maximum fps for various output sizes -->
+        <!-- Any image size smaller than the size listed in Limit row will report
+        fps (as minimum frame duration) up to the fpsBound value. -->
+        <FpsList>
+            <!-- width/height must be increasing, fpsBound must be decreasing-->
+            <Limit  width="640" height="480" fpsBound="60.0" />
+            <Limit  width="640" height="480" fpsBound="30.0" />
+            <Limit  width="640" height="480" fpsBound="15.0" />
+            <Limit  width="800" height="600" fpsBound="60.0" />
+            <Limit  width="800" height="600" fpsBound="30.0" />
+            <Limit  width="800" height="600" fpsBound="15.0" />
+            <Limit  width="1024" height="768" fpsBound="60.0" />
+            <Limit  width="1024" height="768" fpsBound="30.0" />
+            <Limit  width="1024" height="768" fpsBound="15.0" />
+            <Limit  width="1280" height="720" fpsBound="60.0" />
+            <Limit  width="1280" height="720" fpsBound="30.0" />
+            <Limit  width="1280" height="720" fpsBound="15.0" />
+            <Limit  width="1280" height="800" fpsBound="60.0" />
+            <Limit  width="1280" height="800" fpsBound="30.0" />
+            <Limit  width="1280" height="800" fpsBound="15.0" />
+            <Limit  width="1280" height="1024" fpsBound="60.0" />
+            <Limit  width="1280" height="1024" fpsBound="30.0" />
+            <Limit  width="1280" height="1024" fpsBound="15.0" />
+            <Limit  width="1600" height="1200" fpsBound="60.0" />
+            <Limit  width="1600" height="1200" fpsBound="30.0" />
+            <Limit  width="1920" height="1080" fpsBound="60.0" />
+            <Limit  width="1920" height="1080" fpsBound="30.0" />
+            <Limit  width="1920" height="1080" fpsBound="15.0" />
+            <Limit  width="3840" height="2160" fpsBound="60.0" />
+            <Limit  width="3840" height="2160" fpsBound="30.0" />
+            <Limit  width="3840" height="2160" fpsBound="15.0" />
+            <!-- image size larger than the last entry will not be supported-->
+        </FpsList>
+        <!-- orientation -->
+        <Orientation  degree="0"/>
+    </Device>
+</ExternalCamera>
diff --git a/device/rockchip/rk3588/nanopi6_box/etc/external_camera_config.xml b/device/rockchip/rk3588/nanopi6_box/etc/external_camera_config.xml
index 66c964dcce7..65ab5c0783e 100644
--- a/device/rockchip/rk3588/nanopi6_box/etc/external_camera_config.xml
+++ b/device/rockchip/rk3588/nanopi6_box/etc/external_camera_config.xml
@@ -3,6 +3,7 @@
         <ignore> <!-- Internal video devices to be ignored by external camera HAL -->
         <!-- <id>0</id> -->  <!-- No leading/trailing spaces -->
         </ignore>
+        <CameraIdOffset>101</CameraIdOffset>
     </Provider>
     <!-- See ExternalCameraUtils.cpp for default values of Device configurations below-->
     <Device>
@@ -14,6 +15,7 @@
         <NumVideoBuffers  count="4"/>
         <!-- Size of v4l2 buffer queue when streaming < 30fps -->
         <NumStillBuffers  count="2"/>
+
         <!-- List of maximum fps for various output sizes -->
         <!-- Any image size smaller than the size listed in Limit row will report
         fps (as minimum frame duration) up to the fpsBound value. -->
@@ -66,7 +68,8 @@
             <Limit  width="2592" height="1944" fpsBound="5.0" />
             <!-- image size larger than the last entry will not be supported-->
         </FpsList>
+
         <!-- orientation -->
-        <Orientation  degree="0"/>
+        <!-- <Orientation  degree="90" /> -->
     </Device>
 </ExternalCamera>