vfx: add gif animation support

redchenjs · redchenjs · commit 74a652416585 · 2020-01-10T21:38:24.000+08:00
diff --git a/README.md b/README.md
@@ -7,8 +7,8 @@ Bluetooth Speaker based on ESP32 chip with dynamic vision effects output.
 
 * A2DP Audio Streaming
 * I2S & PDM Input / I2S Output
-* VFX Output (Audio FFT / Rainbow / Stars / ...)
-* BLE Control Interface (for VFX Output & Audio Input)
+* VFX Output (GIF / Audio FFT / Rainbow / Stars / ...)
+* BLE Control Interface (for VFX Output)
 * Audio Prompt (Connected / Disconnected / WakeUp / Sleep)
 * OTA Firmware Update (via SPP Profile)
 * Sleep & WakeUp Key
@@ -57,6 +57,10 @@ idf.py menuconfig
 idf.py flash monitor
 ```
 
+## VFX on ST7789 135x240 LCD Panel (GIF)
+
+<img src="docs/st7789gif.png">
+
 ## VFX on ST7735 80x160 LCD Panel (Linear Spectrum)
 
 <img src="docs/st7735lin.png">
diff --git a/components/ugfx/gfxconf.h b/components/ugfx/gfxconf.h
@@ -117,10 +117,10 @@
 //    #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA   TRUE
 //    #define GDISP_INCLUDE_USER_FONTS                 FALSE
 
-// #define GDISP_NEED_IMAGE                            TRUE
-   // #define GDISP_NEED_IMAGE_NATIVE                  TRUE
-   // #define GDISP_NEED_IMAGE_GIF                     TRUE
-      //  #define GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE     32
+#define GDISP_NEED_IMAGE                            TRUE
+   #define GDISP_NEED_IMAGE_NATIVE                  TRUE
+   #define GDISP_NEED_IMAGE_GIF                     TRUE
+       #define GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE     32
 //    #define GDISP_NEED_IMAGE_BMP                     TRUE
 //        #define GDISP_NEED_IMAGE_BMP_1               TRUE
 //        #define GDISP_NEED_IMAGE_BMP_4               TRUE
@@ -305,7 +305,7 @@
 ///////////////////////////////////////////////////////////////////////////
 // GFILE                                                                 //
 ///////////////////////////////////////////////////////////////////////////
-// #define GFX_USE_GFILE                                TRUE
+#define GFX_USE_GFILE                                TRUE
 
 // #define GFILE_NEED_PRINTG                            TRUE
 // #define GFILE_NEED_SCANG                             TRUE
@@ -315,7 +315,7 @@
 // #define GFILE_NEED_NOAUTOMOUNT                       TRUE
 // #define GFILE_NEED_NOAUTOSYNC                        TRUE
 
-// #define GFILE_NEED_MEMFS                             TRUE
+#define GFILE_NEED_MEMFS                             TRUE
 //#define GFILE_NEED_ROMFS                             FALSE
 //#define GFILE_NEED_RAMFS                             FALSE
 //#define GFILE_NEED_FATFS                             FALSE
diff --git a/docs/st7789gif.png b/docs/st7789gif.png
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(COMPONENT_SRCDIRS src src/user src/board src/chip src/core)
 set(COMPONENT_ADD_INCLUDEDIRS inc)
-set(COMPONENT_EMBED_FILES res/snd/snd0.mp3 res/snd/snd1.mp3 res/snd/snd2.mp3 res/snd/snd3.mp3)
+set(COMPONENT_EMBED_FILES res/snd/snd0.mp3 res/snd/snd1.mp3 res/snd/snd2.mp3 res/snd/snd3.mp3 res/ani/ani0_160x80.gif res/ani/ani1_160x80.gif res/ani/ani0_240x135.gif res/ani/ani1_240x135.gif)
 
 register_component()
diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild
@@ -49,6 +49,7 @@ config AUDIO_OUTPUT_I2S_NUM
 choice AUDIO_INPUT
     prompt "Audio Input"
     default AUDIO_INPUT_NONE
+    depends on ENABLE_VFX
     help
         Select Audio Input Interface.
 
@@ -150,13 +151,13 @@ endchoice
 
 choice SCREEN_PANEL_OUTPUT
     prompt "Screen Panel Output Mode"
-    default SCREEN_PANEL_OUTPUT_FFT
+    default SCREEN_PANEL_OUTPUT_VFX
     depends on ENABLE_VFX && !VFX_OUTPUT_CUBE0414
     help
         Select Screen Panel Output Mode.
 
-config SCREEN_PANEL_OUTPUT_FFT
-    bool "Display Audio FFT"
+config SCREEN_PANEL_OUTPUT_VFX
+    bool "Display Visual Effects"
 config SCREEN_PANEL_OUTPUT_MMAP
     bool "Display CUBE0414's Memory Mapping"
 endchoice
diff --git a/main/inc/user/vfx.h b/main/inc/user/vfx.h
@@ -26,6 +26,11 @@
 
 #define DEFAULT_VFX_BACKLIGHT 0xFF
 
+enum vfx_mode {
+    VFX_MODE_PAUSE = 0xFE,
+    VFX_MODE_OFF   = 0xFF,
+};
+
 struct vfx_conf {
     uint8_t mode;
     uint16_t scale_factor;
@@ -36,6 +41,24 @@ struct vfx_conf {
 extern GDisplay *vfx_gdisp;
 extern fft_config_t *vfx_fft_plan;
 
+#ifdef CONFIG_SCREEN_PANEL_OUTPUT_VFX
+    #ifdef CONFIG_VFX_OUTPUT_ST7735
+        // ani0.gif
+        extern const char ani0_160x80_gif_ptr[] asm("_binary_ani0_160x80_gif_start");
+        extern const char ani0_160x80_gif_end[] asm("_binary_ani0_160x80_gif_end");
+        // ani1.gif
+        extern const char ani1_160x80_gif_ptr[] asm("_binary_ani1_160x80_gif_start");
+        extern const char ani1_160x80_gif_end[] asm("_binary_ani1_160x80_gif_end");
+    #elif defined(CONFIG_VFX_OUTPUT_ST7789)
+        // ani0.gif
+        extern const char ani0_240x135_gif_ptr[] asm("_binary_ani0_240x135_gif_start");
+        extern const char ani0_240x135_gif_end[] asm("_binary_ani0_240x135_gif_end");
+        // ani1.gif
+        extern const char ani1_240x135_gif_ptr[] asm("_binary_ani1_240x135_gif_start");
+        extern const char ani1_240x135_gif_end[] asm("_binary_ani1_240x135_gif_end");
+    #endif
+#endif
+
 extern void vfx_set_conf(struct vfx_conf *cfg);
 extern struct vfx_conf *vfx_get_conf(void);
 
diff --git a/main/res/ani/ani0_160x80.gif b/main/res/ani/ani0_160x80.gif
diff --git a/main/res/ani/ani0_240x135.gif b/main/res/ani/ani0_240x135.gif
diff --git a/main/res/ani/ani1_160x80.gif b/main/res/ani/ani1_160x80.gif
diff --git a/main/res/ani/ani1_240x135.gif b/main/res/ani/ani1_240x135.gif
diff --git a/main/src/user/ble_gatts.c b/main/src/user/ble_gatts.c
@@ -166,7 +166,7 @@ static void profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t ga
     #ifndef CONFIG_VFX_OUTPUT_CUBE0414
             | BIT1
     #endif
-    #ifndef CONFIG_SCREEN_PANEL_OUTPUT_FFT
+    #ifndef CONFIG_SCREEN_PANEL_OUTPUT_VFX
             | BIT2
     #endif
     #ifndef CONFIG_AUDIO_INPUT_NONE
diff --git a/main/src/user/bt_spp.c b/main/src/user/bt_spp.c
@@ -140,7 +140,7 @@ void bt_app_spp_cb(esp_spp_cb_event_t event, esp_spp_cb_param_t *param)
                 app_setenv("LAST_REMOTE_BDA", &last_remote_bda, sizeof(esp_bd_addr_t));
 
 #ifdef CONFIG_ENABLE_VFX
-                vfx->mode = 0;
+                vfx->mode = VFX_MODE_OFF;
                 vfx_set_conf(vfx);
 #endif
 #ifndef CONFIG_AUDIO_INPUT_NONE
@@ -191,7 +191,7 @@ void bt_app_spp_cb(esp_spp_cb_event_t event, esp_spp_cb_param_t *param)
 
 #ifdef CONFIG_ENABLE_VFX
                     vfx_prev_mode = vfx->mode;
-                    vfx->mode = 0;
+                    vfx->mode = VFX_MODE_OFF;
                     vfx_set_conf(vfx);
 #endif
 #ifndef CONFIG_AUDIO_INPUT_NONE
diff --git a/main/src/user/key_handle.c b/main/src/user/key_handle.c
@@ -27,7 +27,7 @@ void sleep_key_handle(void)
 
 #ifdef CONFIG_ENABLE_VFX
     struct vfx_conf *vfx = vfx_get_conf();
-    vfx->mode = 0;
+    vfx->mode = VFX_MODE_OFF;
     vfx_set_conf(vfx);
 #endif
 #ifndef CONFIG_AUDIO_INPUT_NONE
diff --git a/main/src/user/vfx.c b/main/src/user/vfx.c
@@ -37,6 +37,18 @@ fft_config_t *vfx_fft_plan = NULL;
 static coord_t vfx_disp_width = 0;
 static coord_t vfx_disp_height = 0;
 
+#ifdef CONFIG_SCREEN_PANEL_OUTPUT_VFX
+static const char *img_file_ptr[][2] = {
+    #ifdef CONFIG_VFX_OUTPUT_ST7735
+        {ani0_160x80_gif_ptr, ani0_160x80_gif_end},     // "Nyan Cat"
+        {ani1_160x80_gif_ptr, ani1_160x80_gif_end},     // "bilibili"
+    #elif defined(CONFIG_VFX_OUTPUT_ST7789)
+        {ani0_240x135_gif_ptr, ani0_240x135_gif_end},   // "Nyan Cat"
+        {ani1_240x135_gif_ptr, ani1_240x135_gif_end},   // "bilibili"
+    #endif
+};
+#endif
+
 static void vfx_task(void *pvParameter)
 {
     portTickType xLastWakeTime;
@@ -51,8 +63,50 @@ static void vfx_task(void *pvParameter)
 
     while (1) {
         switch (vfx.mode) {
-#ifdef CONFIG_SCREEN_PANEL_OUTPUT_FFT
+#ifdef CONFIG_SCREEN_PANEL_OUTPUT_VFX
         // LCD Output
+        case 0x00:
+        case 0x01: {   // 動態貼圖
+            gdispImage gfx_image;
+
+            gdispGSetBacklight(vfx_gdisp, vfx.backlight);
+
+            if (!(gdispImageOpenMemory(&gfx_image, img_file_ptr[vfx.mode][0]) & GDISP_IMAGE_ERR_UNRECOVERABLE)) {
+                gdispImageSetBgColor(&gfx_image, Black);
+
+                while (1) {
+                    xLastWakeTime = xTaskGetTickCount();
+
+                    if (xEventGroupGetBits(user_event_group) & VFX_RELOAD_BIT) {
+                        xEventGroupClearBits(user_event_group, VFX_RELOAD_BIT);
+                        break;
+                    }
+
+                    if (gdispImageDraw(&gfx_image, 0, 0, gfx_image.width, gfx_image.height, 0, 0) != GDISP_IMAGE_ERR_OK) {
+                        ESP_LOGE(TAG, "failed to draw image: %u", vfx.mode);
+                        vfx.mode = VFX_MODE_OFF;
+                        break;
+                    }
+
+                    delaytime_t delay = gdispImageNext(&gfx_image);
+                    if (delay == TIME_INFINITE) {
+                        vfx.mode = VFX_MODE_PAUSE;
+                        break;
+                    }
+
+                    if (delay != TIME_IMMEDIATE) {
+                        vTaskDelayUntil(&xLastWakeTime, delay / portTICK_RATE_MS);
+                    }
+                }
+
+                gdispImageClose(&gfx_image);
+            } else {
+                ESP_LOGE(TAG, "failed to open image: %u", vfx.mode);
+                vfx.mode = VFX_MODE_OFF;
+                break;
+            }
+            break;
+        }
         case 0x0E: {   // 音樂頻譜-漸變-對數
             uint8_t  color_cnt = 0;
             uint16_t color_tmp = 0;
@@ -1722,7 +1776,20 @@ static void vfx_task(void *pvParameter)
 
             break;
         }
-#endif // CONFIG_SCREEN_PANEL_OUTPUT_FFT
+#endif // CONFIG_SCREEN_PANEL_OUTPUT_VFX
+        case VFX_MODE_PAUSE:
+            gdispGSetBacklight(vfx_gdisp, vfx.backlight);
+
+            xEventGroupWaitBits(
+                user_event_group,
+                VFX_RELOAD_BIT,
+                pdTRUE,
+                pdFALSE,
+                portMAX_DELAY
+            );
+
+            break;
+        case VFX_MODE_OFF:
         default:
             gdispGSetBacklight(vfx_gdisp, 0);
 
diff --git a/main/src/user/vfx_core.c b/main/src/user/vfx_core.c
@@ -28,7 +28,7 @@ inline uint32_t vfx_read_color_from_table(uint16_t color_h, uint16_t color_l)
     return pixel_color;
 }
 
-#ifndef CONFIG_SCREEN_PANEL_OUTPUT_FFT
+#ifndef CONFIG_SCREEN_PANEL_OUTPUT_VFX
 void vfx_draw_pixel(uint8_t x, uint8_t y, uint8_t z, uint16_t color_h, uint16_t color_l)
 {
     uint32_t pixel_color = vfx_read_color_from_table(color_h, color_l);
@@ -176,4 +176,4 @@ void vfx_draw_layer_number(uint8_t num, uint8_t layer, uint16_t color_h, uint16_
         }
     }
 }
-#endif // CONFIG_SCREEN_PANEL_OUTPUT_FFT
+#endif // CONFIG_SCREEN_PANEL_OUTPUT_VFX
