Merge branch 'feature/add_esp32s3_support' into 'master'

feat(esp_video): Add ESP32-S3 support

Closes AEG-2484

See merge request espressif/esp-video-components!291

Author: wujiangang

esp_cam_sensor/Kconfig

@@ -15,6 +15,36 @@ menu "Espressif Camera Sensors Configurations"
         rsource "sensors/sc101iot/Kconfig.sc101iot"
         rsource "sensors/sc202cs/Kconfig.sc202cs"
         rsource "sensors/sc2336/Kconfig.sc2336"
+
+        config CAMERA_SENSOR_SWAP_PIXEL_BYTE_ORDER
+            bool "Swap Pixel Byte Order"
+            default y if IDF_TARGET_ESP32P4
+            default n if IDF_TARGET_ESP32S3
+            depends on CAMERA_OV2640 || CAMERA_BF3901
+            help
+                If enabled, the pixel byte order will be swapped, for example:
+
+                    Original RGB565 byte order:
+                    0x00 0x01 0x02 0x03 0x04 0x05
+                     B  G  R   B  G  R   B  G  R
+
+                    Swapped RGB565 byte order:
+                    0x00 0x01 0x02 0x03 0x04 0x05
+                     R  G  B   R  G  B   R  G  B
+
+                    Original YUYV byte order:
+                    0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07
+                     Y    U    Y    V    Y    U    Y    V
+
+                    Swapped YUYV byte order:
+                    0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07
+                     U    Y    V    Y    U    Y    V    Y
+
+                Please note that this option is only valid for OV2640 and BF3901.
+
+                If you want to swap the pixel byte order of other sensors,
+                please use ESP_VIDEO_ENABLE_SWAP_BYTE. Only ESP32-P4 is supported;
+                other platforms are not supported.
     endmenu
 
     menu "Camera XCLK generator Configuration"

esp_cam_sensor/sensors/bf3901/private_include/bf3901_settings.h

@@ -14,7 +14,12 @@
 
 #define G3LB5  0x05
 #define RGB    0x04
+
+#if CONFIG_CAMERA_SENSOR_SWAP_PIXEL_BYTE_ORDER
 #define YUV422 0x02
+#else
+#define YUV422 0x00
+#endif
 
 #ifdef __cplusplus
 extern "C" {

esp_cam_sensor/sensors/ov2640/private_include/ov2640_regs.h

@@ -83,12 +83,12 @@ extern "C" {
 #define IMAGE_MODE_Y8_DVP_EN    0x40
 #define IMAGE_MODE_JPEG_EN      0x10
 
-#if CONFIG_IDF_TARGET_ESP32S3
-#define IMAGE_MODE_YUV422       0x00 // YUV422 format
-#define IMAGE_MODE_RGB565       0x08 // RGB565 format
-#else
-#define IMAGE_MODE_YUV422       0x01 // YUV422 format and byte swap enabled
+#if CONFIG_CAMERA_SENSOR_SWAP_PIXEL_BYTE_ORDER
 #define IMAGE_MODE_RGB565       0x09 // RGB565 format and byte swap enabled
+#define IMAGE_MODE_YUV422       0x01 // YUV422 format and byte swap enabled
+#else
+#define IMAGE_MODE_RGB565       0x08 // RGB565 format
+#define IMAGE_MODE_YUV422       0x00 // YUV422 format
 #endif
 
 #define IMAGE_MODE_RAW10        0x04

esp_cam_sensor/sensors/sc2336/sc2336.c

@@ -5,6 +5,7 @@
  */
 
 #include <string.h>
+#include <sys/param.h>
 #include <freertos/FreeRTOS.h>
 #include <freertos/task.h>
 #include "driver/gpio.h"

esp_cam_sensor/src/driver_cam/esp_cam_ctlr_spi_cam.c

@@ -555,7 +555,7 @@ esp_err_t esp_cam_new_spi_ctlr(const esp_cam_ctlr_spi_config_t *config, esp_cam_
         uint32_t heap_cap = MALLOC_CAP_8BIT | MALLOC_CAP_CACHE_ALIGNED;
 
 #if CONFIG_SPIRAM
-        if (config->bk_buffer_sram) {
+        if (!config->bk_buffer_sram) {
             heap_cap |= MALLOC_CAP_SPIRAM;
         } else {
             heap_cap |= MALLOC_CAP_INTERNAL;

esp_video/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Unreleased
 
 - Add SPI video device and board-level configuration
+- Add ESP32-S3 platform
 - Fix open function crashes after failing to initialize the video device
 
 ## 1.0.0

esp_video/CMakeLists.txt

@@ -9,7 +9,7 @@ set(srcs "src/esp_video_buffer.c"
 set(include_dirs "include")
 set(priv_include_dirs "private_include")
 set(priv_requires "vfs")
-set(requires "esp_driver_cam" "esp_driver_isp" "esp_cam_sensor" "esp_h264" "esp_driver_jpeg")
+set(requires "esp_driver_cam" "esp_cam_sensor")
 
 if(CONFIG_IDF_TARGET_ESP32P4)
     if(CONFIG_ESP_VIDEO_ENABLE_SWAP_SHORT)
@@ -63,7 +63,21 @@ if(CONFIG_ESP_VIDEO_ENABLE_ISP_PIPELINE_CONTROLLER)
     idf_component_optional_requires(PRIVATE "esp_ipa")
 endif()
 
-if(CONFIG_IDF_TARGET_ESP32P4)
+ if(CONFIG_IDF_TARGET_ESP32P4)
+    if(CONFIG_ESP_VIDEO_ENABLE_ISP)
+        # Supply the header files to applications
+        idf_component_optional_requires(PUBLIC "esp_driver_isp")
+    endif()
+
+    if(CONFIG_ESP_VIDEO_ENABLE_HW_JPEG_VIDEO_DEVICE)
+        # Supply the header files to applications
+        idf_component_optional_requires(PUBLIC "esp_driver_jpeg")
+    endif()
+
+    if(CONFIG_ESP_VIDEO_ENABLE_H264_VIDEO_DEVICE)
+        idf_component_optional_requires(PRIVATE "esp_h264")
+    endif()
+
     if(CONFIG_ESP_VIDEO_ENABLE_SWAP_SHORT_PERF_LOG)
         idf_component_optional_requires(PRIVATE "esp_timer")
     endif()

esp_video/Kconfig

@@ -74,7 +74,7 @@ menu "Espressif Video Configuration"
 
     menuconfig ESP_VIDEO_ENABLE_HW_JPEG_VIDEO_DEVICE
         bool "Enable Hardware JPEG based Video Device"
-        depends on IDF_TARGET_ESP32P4
+        depends on SOC_JPEG_CODEC_SUPPORTED
         select ESP_VIDEO_ENABLE_JPEG_VIDEO_DEVICE
         default n
         help
@@ -128,7 +128,5 @@ menu "Espressif Video Configuration"
         help
             Select this option, enable camera motor controller to set the focus of the camera.
 
-    if IDF_TARGET_ESP32P4
-        rsource "./src/data_reprocessing/$IDF_TARGET/Kconfig.data_reprocessing"
-    endif
+    rsource "./src/data_reprocessing/Kconfig.data_reprocessing"
 endmenu

esp_video/examples/capture_stream/.build-test-rules.yml

@@ -1,7 +1,7 @@
 esp_video/examples/capture_stream:
   enable:
-    - if: IDF_TARGET == "esp32p4"
-      reason: only support on esp32p4
+    - if: IDF_TARGET in ["esp32p4", "esp32s3"]
+      reason: only support on esp32p4 and esp32s3
   depends_components:
     - esp_video
     - esp_cam_sensor

esp_video/examples/capture_stream/README.md

@@ -1,3 +1,7 @@
+| Supported Targets | ESP32-P4 | ESP32-S3 |
+| ----------------- | -------- | -------- |
+
+
 # Capture Stream Example
 
 (See the [README.md](../README.md) file in the upper level [examples](../) directory for more information about examples.)
@@ -33,6 +37,16 @@ Component config  --->
         [ ] SC2336  ----
 ```
 
+#### SPI Development Kit
+
+```
+Component config  --->
+    Espressif Camera Sensors Configurations  --->
+        [*] BF3901  --->
+            Auto detect BF3901  --->
+                [*] Detect for SPI interface sensor
+```
+
 ### Build and Flash
 Build the project and flash it to the board, then run monitor tool to view serial output:
 
@@ -124,4 +138,30 @@ I (4367) example:       size:   614400
 I (4367) example:       FPS:    6
 I (4367) main_task: Returned from app_main()
 ...
-```
+```
+
+#### SPI Development Kit
+
+```
+...
+I (1483) main_task: Calling app_main()
+I (1483) example_init_video: SPI camera sensor I2C port=1, scl_pin=8, sda_pin=7, freq=100000
+I (1513) bf3901: Detected Camera sensor PID=0x3901
+I (1573) example: version: 1.0.0
+I (1573) example: driver:  SPI
+I (1573) example: card:    SPI
+I (1573) example: bus:     esp32p4:SPI
+I (1573) example: capabilities:
+I (1573) example:       VIDEO_CAPTURE
+I (1573) example:       STREAMING
+I (1583) example: device capabilities:
+I (1583) example:       VIDEO_CAPTURE
+I (1583) example:       STREAMING
+I (1593) example: Capture YVU 4:2:2 planar format frames for 3 seconds:
+I (4613) example:       width:  240
+I (4613) example:       height: 320
+I (4613) example:       size:   153600
+I (4613) example:       FPS:    10
+I (4613) main_task: Returned from app_main()
+...
+```