bugfix(p4): Fixed ST77922 init parameters and improved video_lcd_display example

Horion0415 · leeebo · commit 02731d29c5bd · 2024-11-15T16:50:41.000+08:00
diff --git a/components/display/lcd/esp_lcd_ek79007/esp_lcd_ek79007.c b/components/display/lcd/esp_lcd_ek79007/esp_lcd_ek79007.c
@@ -5,6 +5,8 @@
  */
 
 #include "soc/soc_caps.h"
+
+#if SOC_MIPI_DSI_SUPPORTED
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "driver/gpio.h"
@@ -274,3 +276,4 @@ static esp_err_t panel_ek79007_invert_color(esp_lcd_panel_t *panel, bool invert_
 
     return ESP_OK;
 }
+#endif
diff --git a/components/display/lcd/esp_lcd_st77922/esp_lcd_st77922_mipi.c b/components/display/lcd/esp_lcd_st77922/esp_lcd_st77922_mipi.c
@@ -178,7 +178,7 @@ static const st77922_lcd_init_cmd_t vendor_specific_init_default[] = {
     {0xB4, (uint8_t []){0x10, 0x09, 0x0B, 0x02, 0x00, 0x19, 0x18, 0x13, 0x1E, 0x1D, 0x1C, 0x1E}, 12, 0},
     {0xB5, (uint8_t []){0x08, 0x12, 0x03, 0x0A, 0x19, 0x01, 0x11, 0x18, 0x1D, 0x1E, 0x1E, 0x1C}, 12, 0},
     {0xB6, (uint8_t []){0xFF, 0xFF, 0x00, 0x07, 0xFF, 0x0B, 0xFF}, 7, 0},
-    {0x29, (uint8_t []){0xB7, 0x00, 0x0B, 0x12, 0x0A, 0x0B, 0x06, 0x37, 0x00, 0x02, 0x4D, 0x08, 0x14, 0x14, 0x30, 0x36, 0x0F}, 17, 0},
+    {0xB7, (uint8_t []){0x00, 0x0B, 0x12, 0x0A, 0x0B, 0x06, 0x37, 0x00, 0x02, 0x4D, 0x08, 0x14, 0x14, 0x30, 0x36, 0x0F}, 17, 0},
     {0xB8, (uint8_t []){0x00, 0x0B, 0x11, 0x09, 0x09, 0x06, 0x37, 0x06, 0x05, 0x4D, 0x08, 0x13, 0x13, 0x2F, 0x36, 0x0F}, 16, 0},
     {0xB9, (uint8_t []){0x23, 0x23}, 2, 0},
     {0xBB, (uint8_t []){0x00, 0x00}, 2, 0},
diff --git a/components/display/lcd/esp_lcd_st77922/include/esp_lcd_st77922.h b/components/display/lcd/esp_lcd_st77922/include/esp_lcd_st77922.h
@@ -240,9 +240,9 @@ esp_err_t esp_lcd_new_panel_st77922(const esp_lcd_panel_io_handle_t io, const es
             .hsync_back_porch = 40,                           \
             .hsync_pulse_width = 2,                           \
             .hsync_front_porch = 40,                          \
-            .vsync_back_porch = 5,                            \
+            .vsync_back_porch = 6,                            \
             .vsync_pulse_width = 2,                           \
-            .vsync_front_porch = 82,                          \
+            .vsync_front_porch = 117,                         \
         },                                                    \
         .flags.use_dma2d = true,                              \
     }
diff --git a/components/display/lcd/esp_lcd_st77922/test_apps/main/test_esp_lcd_st77922_general.c b/components/display/lcd/esp_lcd_st77922/test_apps/main/test_esp_lcd_st77922_general.c
@@ -71,7 +71,7 @@ static void test_draw_color_bar(esp_lcd_panel_handle_t panel_handle, uint16_t h_
     for (int j = 0; j < byte_per_pixel * 8; j++) {
         for (int i = 0; i < row_line * h_res; i++) {
             for (int k = 0; k < byte_per_pixel; k++) {
-                color[i * byte_per_pixel + k] = (BIT(j) >> (k * 8)) & 0xff;
+                color[i * byte_per_pixel + k] = (SPI_SWAP_DATA_TX(BIT(j), TEST_LCD_BIT_PER_PIXEL) >> (k * 8)) & 0xff;
             }
         }
         TEST_ESP_OK(esp_lcd_panel_draw_bitmap(panel_handle, 0, j * row_line, h_res, (j + 1) * row_line, color));
diff --git a/docs/en/display/lcd/lcd_development_guide.rst b/docs/en/display/lcd/lcd_development_guide.rst
@@ -88,7 +88,7 @@ Driver and Examples
     * - I80
       - `axs15231b <https://components.espressif.com/components/espressif/esp_lcd_axs15231b>`_, `st7789 <https://github.com/espressif/esp-idf/blob/master/components/esp_lcd/src/esp_lcd_panel_st7789.c>`_, `nt35510 <https://github.com/espressif/esp-idf/blob/master/components/esp_lcd/src/esp_lcd_panel_nt35510.c>`_, `ra8875 <https://components.espressif.com/components/espressif/esp_lcd_ra8875>`_, `st7796 <https://components.espressif.com/components/espressif/esp_lcd_st7796>`_
     * - MIPI-DSI
-      - `ek79007 <https://components.espressif.com/components/espressif/esp_lcd_ek79007>`_, `jd9165 <https://components.espressif.com/components/espressif/esp_lcd_jd9165>`_, `jd9365 <https://components.espressif.com/components/espressif/esp_lcd_jd9365>`_, `st7701 <https://components.espressif.com/components/espressif/esp_lcd_st7701>`_, `ili9881c <https://components.espressif.com/components/espressif/esp_lcd_ili9881c>`_
+      - `ek79007 <https://components.espressif.com/components/espressif/esp_lcd_ek79007>`_, `jd9165 <https://components.espressif.com/components/espressif/esp_lcd_jd9165>`_, `jd9365 <https://components.espressif.com/components/espressif/esp_lcd_jd9365>`_, `st7701 <https://components.espressif.com/components/espressif/esp_lcd_st7701>`_, `st7703 <https://components.espressif.com/components/espressif/esp_lcd_st7703>`_, `st77922 <https://components.espressif.com/components/espressif/esp_lcd_st77922>`_, `ili9881c <https://components.espressif.com/components/espressif/esp_lcd_ili9881c>`_, `hx8399 <https://components.espressif.com/components/espressif/esp_lcd_hx8399>`_
     * - 3-wire SPI + RGB
       - `st7701 <https://components.espressif.com/components/espressif/esp_lcd_st7701>`_, `st77903_rgb <https://components.espressif.com/components/espressif/esp_lcd_st77903_rgb>`_, `st77922 <https://components.espressif.com/components/espressif/esp_lcd_st77922>`_, `gc9503 <https://components.espressif.com/components/espressif/esp_lcd_gc9503>`_
 
diff --git a/docs/en/display/lcd/lcd_guide.rst b/docs/en/display/lcd/lcd_guide.rst
@@ -356,3 +356,6 @@ Display
 Display refers to the process in which the LCD driver IC displays the received image data on the screen. The speed of this process can be measured by the **screen refresh rate**.
 
 For LCDs with SPI/I80 interfaces, the screen refresh rate is determined by the LCD driver IC and can typically be set by sending specific commands, such as the *ST7789* command ``FRCTRL2 (C6h)``. For LCDs with RGB interfaces, the screen refresh rate is determined by the main controller and is equivalent to the interface frame rate.
+
+.. note::
+  - If development needs to proceed without an LCD, the `esp_lcd_usb_display component <https://components.espressif.com/components/espressif/esp_lcd_usb_display>`_ can be used to simulate the LCD display on a PC monitor via USB UVC, enabling application debugging. The corresponding example is available at `usb_lcd_display <https://github.com/espressif/esp-iot-solution/tree/master/examples/usb/device/usb_lcd_display>`_.
diff --git a/docs/zh_CN/display/lcd/lcd_development_guide.rst b/docs/zh_CN/display/lcd/lcd_development_guide.rst
@@ -88,7 +88,7 @@ LCD 开发指南
     * - I80
       - `axs15231b <https://components.espressif.com/components/espressif/esp_lcd_axs15231b>`_, `st7789 <https://github.com/espressif/esp-idf/blob/master/components/esp_lcd/src/esp_lcd_panel_st7789.c>`_, `nt35510 <https://github.com/espressif/esp-idf/blob/master/components/esp_lcd/src/esp_lcd_panel_nt35510.c>`_, `ra8875 <https://components.espressif.com/components/espressif/esp_lcd_ra8875>`_, `st7796 <https://components.espressif.com/components/espressif/esp_lcd_st7796>`_
     * - MIPI-DSI
-      - `ek79007 <https://components.espressif.com/components/espressif/esp_lcd_ek79007>`_, `jd9165 <https://components.espressif.com/components/espressif/esp_lcd_jd9165>`_, `jd9365 <https://components.espressif.com/components/espressif/esp_lcd_jd9365>`_, `st7701 <https://components.espressif.com/components/espressif/esp_lcd_st7701>`_, `ili9881c <https://components.espressif.com/components/espressif/esp_lcd_ili9881c>`_
+      - `ek79007 <https://components.espressif.com/components/espressif/esp_lcd_ek79007>`_, `jd9165 <https://components.espressif.com/components/espressif/esp_lcd_jd9165>`_, `jd9365 <https://components.espressif.com/components/espressif/esp_lcd_jd9365>`_, `st7701 <https://components.espressif.com/components/espressif/esp_lcd_st7701>`_, `st7703 <https://components.espressif.com/components/espressif/esp_lcd_st7703>`_, `st77922 <https://components.espressif.com/components/espressif/esp_lcd_st77922>`_, `ili9881c <https://components.espressif.com/components/espressif/esp_lcd_ili9881c>`_, `hx8399 <https://components.espressif.com/components/espressif/esp_lcd_hx8399>`_
     * - 3-wire SPI + RGB
       - `st7701 <https://components.espressif.com/components/espressif/esp_lcd_st7701>`_, `st77903_rgb <https://components.espressif.com/components/espressif/esp_lcd_st77903_rgb>`_, `st77922 <https://components.espressif.com/components/espressif/esp_lcd_st77922>`_, `gc9503 <https://components.espressif.com/components/espressif/esp_lcd_gc9503>`_
 
diff --git a/docs/zh_CN/display/lcd/lcd_guide.rst b/docs/zh_CN/display/lcd/lcd_guide.rst
@@ -356,3 +356,7 @@ RGB 接口
 显示是指 LCD 的驱动 IC 将接收到的图像数据显示到屏幕上的过程，其快慢可以用 **屏幕刷新率** 来衡量。
 
 对于 SPI/I80 接口的 LCD，屏幕刷新率是由 LCD 驱动 IC 决定的，一般可以通过发送特定的命令来设置，如 *ST7789* 的 ``FRCTRL2(C6h)`` 命令；对于 RGB 接口的 LCD，屏幕刷新率是由主控决定的，其等价于接口帧率。
+
+.. note::
+
+  - 若需要在无 LCD 的情况下开发，可以通过 `esp_lcd_usb_display 组件 <https://components.espressif.com/components/espressif/esp_lcd_usb_display>`_ 通过 USB UVC 在 PC 显示器上模拟 LCD 的显示效果，从而调试应用程序。其对应示例为 `usb_lcd_display <https://github.com/espressif/esp-iot-solution/tree/master/examples/usb/device/usb_lcd_display>`_
diff --git a/examples/camera/video_lcd_display/README.md b/examples/camera/video_lcd_display/README.md
@@ -9,7 +9,7 @@ This example is based on the [esp_video](https://github.com/espressif/esp-video-
 
 ## ESP-IDF Required
 
-- Currently, this example only supports compilation and use on the ESP-IDF master branch. The recommended commit for testing is: ac6c54c997f68662ed2c0b6cb07edd3736175c16.
+- This example supports ESP-IDF release/v5.4 and later branches. By default, it runs on ESP-IDF release/v5.4.
 - Please follow the [ESP-IDF Programming Guide](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/get-started/index.html) to set up the development environment. **We highly recommend** you [Build Your First Project](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/get-started/index.html#build-your-first-project) to get familiar with ESP-IDF and make sure the environment is set up correctly.
 
 ### Prerequisites
diff --git a/examples/camera/video_lcd_display/main/app_video.c b/examples/camera/video_lcd_display/main/app_video.c
@@ -28,12 +28,16 @@ static const char *TAG = "app_video";
 typedef struct {
     uint8_t *camera_buffer[MAX_BUFFER_COUNT];
     size_t camera_buf_size;
+    uint8_t camera_buf_count;
     uint32_t camera_buf_hes;
     uint32_t camera_buf_ves;
     struct v4l2_buffer v4l2_buf;
     uint8_t camera_mem_mode;
     app_video_frame_operation_cb_t user_camera_video_frame_operation_cb;
     TaskHandle_t video_stream_task_handle;
+    uint8_t video_task_core_id;
+    bool video_task_delete;
+    void *video_task_user_data;
 } app_video_t;
 
 static app_video_t app_camera_video;
@@ -170,6 +174,7 @@ esp_err_t app_video_set_bufs(int video_fd, uint32_t fb_num, const void **fb)
 
     memset(&req, 0, sizeof(req));
     req.count = fb_num;
+    app_camera_video.camera_buf_count = fb_num;
     req.type = type;
 
     app_camera_video.camera_mem_mode = req.memory = fb ? V4L2_MEMORY_USERPTR : V4L2_MEMORY_MMAP;
@@ -279,7 +284,8 @@ static inline void video_operation_video_frame(int video_fd)
                         buf_index,
                         app_camera_video.camera_buf_hes,
                         app_camera_video.camera_buf_ves,
-                        app_camera_video.camera_buf_size
+                        app_camera_video.camera_buf_size,
+                        app_camera_video.video_task_user_data
                     );
 }
 
@@ -345,12 +351,21 @@ static void video_stream_task(void *arg)
         video_operation_video_frame(video_fd);
 
         ESP_ERROR_CHECK(video_free_video_frame(video_fd));
+
+        if (app_camera_video.video_task_delete) {
+            app_camera_video.video_task_delete = false;
+            ESP_ERROR_CHECK(video_stream_stop(video_fd));
+            vTaskDelete(NULL);
+        }
     }
     vTaskDelete(NULL);
 }
 
-esp_err_t app_video_stream_task_start(int video_fd, int core_id)
+esp_err_t app_video_stream_task_start(int video_fd, int core_id, void *user_data)
 {
+    app_camera_video.video_task_core_id = core_id;
+    app_camera_video.video_task_user_data = user_data;
+
     video_stream_start(video_fd);
 
     BaseType_t result = xTaskCreatePinnedToCore(video_stream_task, "video stream task", VIDEO_TASK_STACK_SIZE, &video_fd, VIDEO_TASK_PRIORITY, &app_camera_video.video_stream_task_handle, core_id);
@@ -367,14 +382,25 @@ esp_err_t app_video_stream_task_start(int video_fd, int core_id)
     return ESP_FAIL;
 }
 
-esp_err_t app_video_stream_task_stop(int video_fd)
+esp_err_t app_video_stream_task_restart(int video_fd)
 {
-    if (app_camera_video.video_stream_task_handle != NULL) {
-        vTaskDelete(app_camera_video.video_stream_task_handle);
-        app_camera_video.video_stream_task_handle = NULL;
+    app_video_set_bufs(video_fd, app_camera_video.camera_buf_count, (const void **)app_camera_video.camera_buffer);
+
+    esp_err_t ret = app_video_stream_task_start(video_fd, app_camera_video.video_task_core_id, app_camera_video.video_task_user_data);
+    if (ret != ESP_OK) {
+        ESP_LOGE(TAG, "failed to restart video stream task");
+        goto errout;
     }
 
-    ESP_ERROR_CHECK(video_stream_stop(video_fd));
+    return ESP_OK;
+
+errout:
+    return ESP_FAIL;
+}
+
+esp_err_t app_video_stream_task_stop(int video_fd)
+{
+    app_camera_video.video_task_delete = true;
 
     return ESP_OK;
 }
diff --git a/examples/camera/video_lcd_display/main/app_video.h b/examples/camera/video_lcd_display/main/app_video.h
@@ -33,7 +33,7 @@ typedef enum {
 #define APP_VIDEO_FMT              (APP_VIDEO_FMT_RGB888)
 #endif
 
-typedef void (*app_video_frame_operation_cb_t)(uint8_t *camera_buf, uint8_t camera_buf_index, uint32_t camera_buf_hes, uint32_t camera_buf_ves, size_t camera_buf_len);
+typedef void (*app_video_frame_operation_cb_t)(uint8_t *camera_buf, uint8_t camera_buf_index, uint32_t camera_buf_hes, uint32_t camera_buf_ves, size_t camera_buf_len, void *user_data);
 
 /**
  * @brief Initialize the video camera.
@@ -110,7 +110,21 @@ uint32_t app_video_get_buf_size(void);
  * @param core_id Core ID to which the task will be pinned.
  * @return ESP_OK on success, or ESP_FAIL on failure.
  */
-esp_err_t app_video_stream_task_start(int video_fd, int core_id);
+esp_err_t app_video_stream_task_start(int video_fd, int core_id, void *user_data);
+
+/**
+ * @brief Restart the video stream task.
+ *
+ * This function stops the current video stream task and restarts it with the specified
+ * video device file descriptor. It first sets the necessary buffers for the video stream,
+ * then attempts to start the video stream task on the specified core.
+ *
+ * @param video_fd File descriptor for the video device.
+ * @return
+ * - ESP_OK on successful restart of the video stream task.
+ * - ESP_FAIL if there was an error while restarting the task.
+ */
+esp_err_t app_video_stream_task_restart(int video_fd);
 
 /**
  * @brief Stop the video stream task.
diff --git a/examples/camera/video_lcd_display/main/main.c b/examples/camera/video_lcd_display/main/main.c
@@ -18,7 +18,7 @@
 
 #define ALIGN_UP(num, align)    (((num) + ((align) - 1)) & ~((align) - 1))
 
-static void camera_video_frame_operation(uint8_t *camera_buf, uint8_t camera_buf_index, uint32_t camera_buf_hes, uint32_t camera_buf_ves, size_t camera_buf_len);
+static void camera_video_frame_operation(uint8_t *camera_buf, uint8_t camera_buf_index, uint32_t camera_buf_hes, uint32_t camera_buf_ves, size_t camera_buf_len, void *user_data);
 
 static const char *TAG = "app_main";
 
@@ -86,14 +86,14 @@ void app_main(void)
     ESP_ERROR_CHECK(app_video_register_frame_operation_cb(camera_video_frame_operation));
 
     // Start the camera stream task
-    ESP_ERROR_CHECK(app_video_stream_task_start(video_cam_fd0, 0));
+    ESP_ERROR_CHECK(app_video_stream_task_start(video_cam_fd0, 0, NULL));
 
 #if CONFIG_EXAMPLE_ENABLE_PRINT_FPS_RATE_VALUE
     start_time = esp_timer_get_time();  // Get the initial time for frame rate statistics
 #endif
 }
 
-static void camera_video_frame_operation(uint8_t *camera_buf, uint8_t camera_buf_index, uint32_t camera_buf_hes, uint32_t camera_buf_ves, size_t camera_buf_len)
+static void camera_video_frame_operation(uint8_t *camera_buf, uint8_t camera_buf_index, uint32_t camera_buf_hes, uint32_t camera_buf_ves, size_t camera_buf_len, void *user_data)
 {
 #if CONFIG_EXAMPLE_ENABLE_PRINT_FPS_RATE_VALUE
     fps_count++;

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ static void test_draw_color_bar(esp_lcd_panel_handle_t panel_handle, uint16_t h_`
`71`	`71`	`for (int j = 0; j < byte_per_pixel * 8; j++) {`
`72`	`72`	`for (int i = 0; i < row_line * h_res; i++) {`
`73`	`73`	`for (int k = 0; k < byte_per_pixel; k++) {`
`74`		`- color[i * byte_per_pixel + k] = (BIT(j) >> (k * 8)) & 0xff;`
	`74`	`+ color[i * byte_per_pixel + k] = (SPI_SWAP_DATA_TX(BIT(j), TEST_LCD_BIT_PER_PIXEL) >> (k * 8)) & 0xff;`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`	`TEST_ESP_OK(esp_lcd_panel_draw_bitmap(panel_handle, 0, j * row_line, h_res, (j + 1) * row_line, color));`