Merge branch 'feature/add_riscv_software_swap_byte' into 'master'

donghengqaz · donghengqaz · commit e69c4af837bf · 2025-10-13T14:35:37.000+08:00
feat(esp_video): Add RISC-V software swap byte function for DVP video device

Closes AEG-2815

See merge request espressif/esp-video-components!333
diff --git a/esp_cam_sensor/CHANGELOG.md b/esp_cam_sensor/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+- Added option to return byte swap flags for GC0308
+
 ## 1.4.0
 
 - Update driver dependency, not rely on old `driver` component anymore
diff --git a/esp_cam_sensor/sensors/gc0308/gc0308.c b/esp_cam_sensor/sensors/gc0308/gc0308.c
@@ -274,7 +274,20 @@ static esp_err_t gc0308_query_para_desc(esp_cam_sensor_device_t *dev, esp_cam_se
 
 static esp_err_t gc0308_get_para_value(esp_cam_sensor_device_t *dev, uint32_t id, void *arg, size_t size)
 {
-    return ESP_ERR_NOT_SUPPORTED;
+    esp_err_t ret = ESP_OK;
+
+    switch (id) {
+#if CONFIG_CAMERA_SENSOR_SWAP_PIXEL_BYTE_ORDER
+    case ESP_CAM_SENSOR_DATA_SEQ:
+        *(uint32_t *)arg = ESP_CAM_SENSOR_DATA_SEQ_BYTE_SWAPPED;
+        break;
+#endif
+    default:
+        ret = ESP_ERR_NOT_SUPPORTED;
+        break;
+    }
+
+    return ret;
 }
 
 static esp_err_t gc0308_set_para_value(esp_cam_sensor_device_t *dev, uint32_t id, const void *arg, size_t size)
diff --git a/esp_video/CHANGELOG.md b/esp_video/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## Unreleased
 
+- Add RISC-V software swap byte function for DVP video device
 - Add the customized video class to call esp_cam_sensor ioctl commands directly
 - Add the second SPI video device
 - Improve AEC controller time precision
diff --git a/esp_video/CMakeLists.txt b/esp_video/CMakeLists.txt
@@ -19,6 +19,7 @@ if(CONFIG_IDF_TARGET_ESP32P4)
 
     if(CONFIG_ESP_VIDEO_ENABLE_SWAP_BYTE)
         list(APPEND srcs "src/data_reprocessing/esp32p4/esp_video_swap_byte.c")
+        list(APPEND srcs "src/data_reprocessing/esp32p4/esp_video_swap_byte.S")
     endif()
 endif()
 
diff --git a/esp_video/private_include/esp_video_swap_byte.h b/esp_video/private_include/esp_video_swap_byte.h
@@ -9,7 +9,9 @@
 #include "sdkconfig.h"
 #include "esp_err.h"
 #include "esp_cam_sensor.h"
+#if CONFIG_ESP_VIDEO_ENABLE_SWAP_BYTE_BITSCRAMBLER
 #include "driver/bitscrambler.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -19,7 +21,11 @@ extern "C" {
  * @brief Video swap byte object
  */
 typedef struct esp_video_swap_byte {
+#if CONFIG_ESP_VIDEO_ENABLE_SWAP_BYTE_BITSCRAMBLER
     bitscrambler_handle_t bs;               /*!< Bitscrambler handle */
+#else
+    void *priv;                             /*!< Swap short byte data */
+#endif
 } esp_video_swap_byte_t;
 
 /**
@@ -49,6 +55,23 @@ esp_err_t esp_video_swap_byte_start(esp_video_swap_byte_t *swap_byte);
  */
 void esp_video_swap_byte_free(esp_video_swap_byte_t *swap_byte);
 
+/**
+ * @brief Process video swap byte
+ *
+ * @param swap_byte     Video swap byte object pointer
+ * @param src           Source buffer pointer
+ * @param src_size      Source buffer size
+ * @param dst           Destination buffer pointer
+ * @param dst_size      Destination buffer size
+ * @param ret_size      Result data size buffer
+ *
+ * @return
+ *      - ESP_OK on success
+ *      - Others if failed
+ */
+esp_err_t esp_video_swap_byte_process(esp_video_swap_byte_t *swap_byte,  void *src, size_t src_size,
+                                      void *dst, size_t dst_size, size_t *ret_size);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/esp_video/src/data_reprocessing/Kconfig.data_reprocessing b/esp_video/src/data_reprocessing/Kconfig.data_reprocessing
@@ -222,11 +222,10 @@ menuconfig ESP_VIDEO_ENABLE_SWAP_SHORT
 
     endif # ESP_VIDEO_ENABLE_SWAP_SHORT
 
-config ESP_VIDEO_ENABLE_SWAP_BYTE
+menuconfig ESP_VIDEO_ENABLE_SWAP_BYTE
     bool "Enable 8-bit data swapping"
     default y
     select ESP_VIDEO_ENABLE_DATA_PREPROCESSING
-    select ESP_VIDEO_ENABLE_BITSCRAMBLER
     depends on SOC_BITSCRAMBLER_SUPPORTED && ESP_VIDEO_ENABLE_DVP_VIDEO_DEVICE
     help
         Enable swapping of 8-bit (byte) data for DVP video streams.
@@ -245,4 +244,54 @@ config ESP_VIDEO_ENABLE_SWAP_BYTE
 
         Required for proper color reproduction with many DVP camera modules.
         Uses hardware bitscrambler for efficient processing without CPU overhead.
+
+if ESP_VIDEO_ENABLE_SWAP_BYTE
+    choice ESP_VIDEO_ENABLE_SWAP_BYTE_IMPL
+        prompt "8-bit swap implementation method"
+        default ESP_VIDEO_ENABLE_SWAP_BYTE_RISCV
+        help
+            Select the implementation method for 8-bit data swapping.
+
+            Performance comparison (typical):
+            - RISC-V Assembly: Fast, uses CPU cores
+            - Hardware Bitscrambler: Fastest, offloads CPU but uses peripheral
+
+            Choose based on your performance requirements and available peripherals.
+
+        config ESP_VIDEO_ENABLE_SWAP_BYTE_RISCV
+            bool "RISC-V assembly instructions"
+            help
+                Use optimized RISC-V assembly instructions for data swapping.
+
+                Benefits:
+                - Fast execution speed
+                - Low latency processing
+                - No peripheral dependencies
+
+                Trade-offs:
+                - Uses CPU cycles
+                - May affect other real-time tasks
+
+                Best for: High-performance applications where speed is critical.
+
+        config ESP_VIDEO_ENABLE_SWAP_BYTE_BITSCRAMBLER
+            bool "Hardware bitscrambler - Experimental"
+            select ESP_VIDEO_ENABLE_BITSCRAMBLER
+            depends on SOC_BITSCRAMBLER_SUPPORTED
+            help
+                Use dedicated hardware bitscrambler peripheral for data swapping.
+
+                Benefits:
+                - Offloads CPU processing
+                - Allows CPU to handle other tasks
+                - No impact on real-time performance
+
+                Trade-offs:
+                - Faster than CPU-based methods without latency
+                - Requires available peripheral
+                - Experimental feature
+
+                Best for: Applications where CPU resources are constrained.
+    endchoice # ESP_VIDEO_ENABLE_SWAP_BYTE_IMPL
+endif #ESP_VIDEO_ENABLE_SWAP_BYTE
 endmenu
diff --git a/esp_video/src/data_reprocessing/esp32p4/esp_video_swap_byte.S b/esp_video/src/data_reprocessing/esp32p4/esp_video_swap_byte.S
@@ -0,0 +1,112 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: ESPRESSIF MIT
+ */
+
+/**
+ * @brief Swap byte data based on RISC-V instruction
+ *
+ * @param a0    Source buffer pointer
+ * @param a1    Destination buffer pointer
+ * @param a2    Buffer size
+ *
+ * @Note void esp_video_swap_byte_riscv(void *src, void *dst, size_t size);
+ */
+    .text
+    .section    .text.esp_video_swap_byte_riscv, "ax"
+    .global     esp_video_swap_byte_riscv
+    .type       esp_video_swap_byte_riscv,@function
+    .align      4
+esp_video_swap_byte_riscv:
+    addi    sp,  sp, -32
+    sw      s0,  0(sp)
+    sw      s1,  4(sp)
+    sw      s2,  8(sp)
+    sw      s3,  12(sp)
+    sw      s4,  16(sp)
+    sw      s5,  20(sp)
+
+    add     a2,  a0, a2
+    li      s4,  0xff00ff00
+    li      s5,  0x00ff00ff
+
+esp_video_swap_byte_riscv_loop:
+    lw      a3,  0(a0)
+    lw      a4,  4(a0)
+    lw      a5,  8(a0)
+    lw      a6,  12(a0)
+    lw      a7,  16(a0)
+    lw      s0,  20(a0)
+    lw      s1,  24(a0)
+    lw      s2,  28(a0)
+
+    srli    s3,  a3, 8
+    and     s3,  s3, s5
+    slli    a3,  a3, 8
+    and     a3,  a3, s4
+    or      a3,  a3, s3
+    sw      a3,  0(a1)
+
+    srli    s3,  a4, 8
+    and     s3,  s3, s5
+    slli    a4,  a4, 8
+    and     a4,  a4, s4
+    or      a4,  a4, s3
+    sw      a4,  4(a1)
+
+    srli    s3,  a5, 8
+    and     s3,  s3, s5
+    slli    a5,  a5, 8
+    and     a5,  a5, s4
+    or      a5,  a5, s3
+    sw      a5,  8(a1)
+
+    srli    s3,  a6, 8
+    and     s3,  s3, s5
+    slli    a6,  a6, 8
+    and     a6,  a6, s4
+    or      a6,  a6, s3
+    sw      a6,  12(a1)
+
+    srli    s3,  a7, 8
+    and     s3,  s3, s5
+    slli    a7,  a7, 8
+    and     a7,  a7, s4
+    or      a7,  a7, s3
+    sw      a7,  16(a1)
+
+    srli    s3,  s0, 8
+    and     s3,  s3, s5
+    slli    s0,  s0, 8
+    and     s0,  s0, s4
+    or      s0,  s0, s3
+    sw      s0,  20(a1)
+
+    srli    s3,  s1, 8
+    and     s3,  s3, s5
+    slli    s1,  s1, 8
+    and     s1,  s1, s4
+    or      s1,  s1, s3
+    sw      s1,  24(a1)
+
+    srli    s3,  s2, 8
+    and     s3,  s3, s5
+    slli    s2,  s2, 8
+    and     s2,  s2, s4
+    or      s2,  s2, s3
+    sw      s2,  28(a1)
+
+    addi    a0, a0, 32
+    addi    a1, a1, 32
+    bltu    a0, a2, esp_video_swap_byte_riscv_loop
+
+    lw      s0,  0(sp)
+    lw      s1,  4(sp)
+    lw      s2,  8(sp)
+    lw      s3,  12(sp)
+    lw      s4,  16(sp)
+    lw      s5,  20(sp)
+    addi    sp,  sp, 32
+
+    ret
diff --git a/esp_video/src/data_reprocessing/esp32p4/esp_video_swap_byte.c b/esp_video/src/data_reprocessing/esp32p4/esp_video_swap_byte.c
@@ -13,7 +13,11 @@
 
 static const char *TAG = "swap_byte";
 
+#if CONFIG_ESP_VIDEO_ENABLE_SWAP_BYTE_BITSCRAMBLER
 BITSCRAMBLER_PROGRAM(esp_video_swap_byte, "esp_video_swap_byte");
+#elif CONFIG_ESP_VIDEO_ENABLE_SWAP_BYTE_RISCV
+extern void esp_video_swap_byte_riscv(void *src, void *dst, uint32_t size);
+#endif
 
 /**
  * @brief Create video swap byte
@@ -22,14 +26,17 @@ BITSCRAMBLER_PROGRAM(esp_video_swap_byte, "esp_video_swap_byte");
  */
 esp_video_swap_byte_t *esp_video_swap_byte_create(void)
 {
-    esp_err_t ret;
     esp_video_swap_byte_t *swap_byte;
 
     swap_byte = heap_caps_calloc(1, sizeof(esp_video_swap_byte_t), MALLOC_CAP_8BIT | MALLOC_CAP_8BIT);
     if (!swap_byte) {
+        ESP_LOGE(TAG, "Failed to allocate memory for swap byte");
         return NULL;
     }
 
+#if CONFIG_ESP_VIDEO_ENABLE_SWAP_BYTE_BITSCRAMBLER
+    esp_err_t ret;
+
     bitscrambler_config_t bs_config = {
         .dir = BITSCRAMBLER_DIR_RX,
         .attach_to = SOC_BITSCRAMBLER_ATTACH_LCD_CAM,
@@ -52,6 +59,9 @@ esp_video_swap_byte_t *esp_video_swap_byte_create(void)
 exit_0:
     heap_caps_free(swap_byte);
     return NULL;
+#else
+    return swap_byte;
+#endif
 }
 
 /**
@@ -65,6 +75,7 @@ esp_video_swap_byte_t *esp_video_swap_byte_create(void)
  */
 esp_err_t IRAM_ATTR esp_video_swap_byte_start(esp_video_swap_byte_t *swap_byte)
 {
+#if CONFIG_ESP_VIDEO_ENABLE_SWAP_BYTE_BITSCRAMBLER
     esp_err_t ret;
 
     if ((ret = bitscrambler_reset(swap_byte->bs)) != ESP_OK) {
@@ -78,6 +89,9 @@ esp_err_t IRAM_ATTR esp_video_swap_byte_start(esp_video_swap_byte_t *swap_byte)
     }
 
     return ESP_OK;
+#else
+    return ESP_OK;
+#endif
 }
 
 /**
@@ -89,8 +103,35 @@ esp_err_t IRAM_ATTR esp_video_swap_byte_start(esp_video_swap_byte_t *swap_byte)
  */
 void esp_video_swap_byte_free(esp_video_swap_byte_t *swap_byte)
 {
+#if CONFIG_ESP_VIDEO_ENABLE_SWAP_BYTE_BITSCRAMBLER
     bitscrambler_reset(swap_byte->bs);
     bitscrambler_disable(swap_byte->bs);
     bitscrambler_free(swap_byte->bs);
-    swap_byte->bs = NULL;
+#endif
+
+    heap_caps_free(swap_byte);
+}
+
+/**
+ * @brief Process video swap byte
+ *
+ * @param swap_byte     Video swap byte object pointer
+ * @param src           Source buffer pointer
+ * @param src_size      Source buffer size
+ * @param dst           Destination buffer pointer
+ * @param dst_size      Destination buffer size
+ * @param ret_size      Result data size buffer
+ *
+ * @return
+ *      - ESP_OK on success
+ *      - Others if failed
+ */
+esp_err_t esp_video_swap_byte_process(esp_video_swap_byte_t *swap_byte,  void *src, size_t src_size,
+                                      void *dst, size_t dst_size, size_t *ret_size)
+{
+#if CONFIG_ESP_VIDEO_ENABLE_SWAP_BYTE_RISCV
+    esp_video_swap_byte_riscv(src, dst, src_size);
+#endif
+    *ret_size = src_size;
+    return ESP_OK;
 }
diff --git a/esp_video/src/data_reprocessing/esp32p4/esp_video_swap_short.c b/esp_video/src/data_reprocessing/esp32p4/esp_video_swap_short.c
@@ -178,4 +178,6 @@ void esp_video_swap_short_free(esp_video_swap_short_t *swap_short)
 #if CONFIG_ESP_VIDEO_ENABLE_SWAP_SHORT_BITSCRAMBLER
     bitscrambler_free((bitscrambler_handle_t)swap_short->priv);
 #endif
+
+    heap_caps_free(swap_short);
 }
diff --git a/esp_video/src/device/esp_video_dvp_device.c b/esp_video/src/device/esp_video_dvp_device.c
diff --git a/esp_video/test_apps/posix/main/test_apps_posix_main.c b/esp_video/test_apps/posix/main/test_apps_posix_main.c

Original file line number	Diff line number	Diff line change
`@@ -178,4 +178,6 @@ void esp_video_swap_short_free(esp_video_swap_short_t *swap_short)`
`178`	`178`	`#if CONFIG_ESP_VIDEO_ENABLE_SWAP_SHORT_BITSCRAMBLER`
`179`	`179`	`bitscrambler_free((bitscrambler_handle_t)swap_short->priv);`
`180`	`180`	`#endif`
	`181`	`+`
	`182`	`+ heap_caps_free(swap_short);`
`181`	`183`	`}`