Merge branch 'moononournation:master' into master

Author: mathertel

README.md

@@ -331,6 +331,7 @@ ESP32LCD8, ESP32LCD16 and ESP32RGBPanel only supported by arduino-esp32 v2.x and
 * [ESP32-S3-RGB](https://github.com/W00ng/ESP32-S3-RGB-Panel) [[LVGL demo video](https://youtu.be/d11yUvjh34A)]
 * ESP32S3-2.1-TP
 * [ESPboy](https://www.espboy.com) [[demo video](https://youtu.be/Cx82XWrc8-0)]
+* [Guition JC1060P470](https://www.aliexpress.com/item/1005008328088576.html) [[demo video](https://youtu.be/CF1EDSQDHQ8)] [[LVGL demo](https://youtu.be/CF1EDSQDHQ8)]
 * [LILYGO T-Deck](https://www.lilygo.cc/products/t-deck) [[demo video](https://youtube.com/shorts/fXKTVqjUoPM)]
 * [LILYGO T-Display](https://www.lilygo.cc/products/lilygo®-ttgo-t-display-1-14-inch-lcd-esp32-control-board)
 * [LILYGO T-Display-S3](https://www.lilygo.cc/products/t-display-s3) [[demo video](https://youtu.be/kpRC64QNQAo)]

examples/ImgViewer/ImgViewerJpeg_JPEGDEC/ImgViewerJpeg_JPEGDEC.ino renamed to examples/ImgViewer/ImgViewerJpeg/ImgViewerJpeg.ino

@@ -0,0 +1,169 @@
+/*******************************************************************************
+ * ESP32 SIMD Motion JPEG Image Viewer
+ * This is a simple Motion JPEG image viewer example using ESP32 SIMD
+ * Image Source: https://www.pexels.com/video/earth-rotating-video-856356/
+ * cropped: x: 598 y: 178 width: 720 height: 720 resized: 240x240
+ * ffmpeg -i "Pexels Videos 3931.mp4" -ss 0 -t 20.4s -vf "reverse,setpts=0.5*PTS,fps=10,vflip,hflip,rotate=90,crop=720:720:178:598,scale=240:240:flags=lanczos" -q:v 11 earth.mjpeg
+ *
+ * Dependent libraries:
+ * ESP32_JPEG: https://github.com/esp-arduino-libs/ESP32_JPEG.git
+ *
+ * Setup steps:
+ * 1. Change your LCD parameters in Arduino_GFX setting
+ * 2. Upload Motion JPEG file
+ *   FFat/LittleFS:
+ *     upload FFat (FatFS) data with ESP32 Sketch Data Upload:
+ *     ESP32: https://github.com/lorol/arduino-esp32fs-plugin
+ *   SD:
+ *     Most Arduino system built-in support SD file system.
+ ******************************************************************************/
+#define ROOT "/root"
+#define MJPEG_FILENAME ROOT "/earth.mjpeg"
+#define MJPEG_OUTPUT_SIZE (240 * 240 * 2)          // memory for a output image frame
+#define MJPEG_BUFFER_SIZE (MJPEG_OUTPUT_SIZE / 10) // memory for a single JPEG frame
+
+/*******************************************************************************
+ * Start of Arduino_GFX setting
+ ******************************************************************************/
+#include <Arduino_GFX_Library.h>
+
+#define GFX_BL DF_GFX_BL // default backlight pin, you may replace DF_GFX_BL to actual backlight pin
+
+/* More dev device declaration: https://github.com/moononournation/Arduino_GFX/wiki/Dev-Device-Declaration */
+#if defined(DISPLAY_DEV_KIT)
+Arduino_GFX *gfx = create_default_Arduino_GFX();
+#else /* !defined(DISPLAY_DEV_KIT) */
+
+/* More data bus class: https://github.com/moononournation/Arduino_GFX/wiki/Data-Bus-Class */
+Arduino_DataBus *bus = create_default_Arduino_DataBus();
+
+/* More display class: https://github.com/moononournation/Arduino_GFX/wiki/Display-Class */
+Arduino_GFX *gfx = new Arduino_ILI9341(bus, DF_GFX_RST, 3 /* rotation */, false /* IPS */);
+
+#endif /* !defined(DISPLAY_DEV_KIT) */
+/*******************************************************************************
+ * End of Arduino_GFX setting
+ ******************************************************************************/
+
+#include <FFat.h>
+#include <LittleFS.h>
+#include <SPIFFS.h>
+#include <SD.h>
+#include <SD_MMC.h>
+
+#include "MjpegClass.h"
+static MjpegClass mjpeg;
+
+/* variables */
+static int total_frames = 0;
+static unsigned long total_read_video = 0;
+static unsigned long total_decode_video = 0;
+static unsigned long total_show_video = 0;
+static unsigned long start_ms, curr_ms;
+static int16_t x = -1, y = -1, w = -1, h = -1;
+
+void setup()
+{
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
+  Serial.begin(115200);
+  // Serial.setDebugOutput(true);
+  // while(!Serial);
+  Serial.println("Arduino_GFX Motion JPEG ESP32P4 Decoder Image Viewer example");
+
+  // Init Display
+  if (!gfx->begin())
+  {
+    Serial.println("gfx->begin() failed!");
+  }
+  gfx->fillScreen(RGB565_BLACK);
+
+#ifdef GFX_BL
+  pinMode(GFX_BL, OUTPUT);
+  digitalWrite(GFX_BL, HIGH);
+#endif
+
+  // if (!FFat.begin(false, ROOT))
+  if (!LittleFS.begin(false, ROOT))
+  // if (!SPIFFS.begin(false, ROOT))
+  // SPI.begin(12 /* CLK */, 13 /* D0/MISO */, 11 /* CMD/MOSI */);
+  // if (!SD.begin(10 /* CS */, SPI, 80000000L, ROOT))
+  // pinMode(10 /* CS */, OUTPUT);
+  // digitalWrite(SD_CS, HIGH);
+  // SD_MMC.setPins(12 /* CLK */, 11 /* CMD/MOSI */, 13 /* D0/MISO */);
+  // if (!SD_MMC.begin(ROOT, true /* mode1bit */, false /* format_if_mount_failed */, SDMMC_FREQ_DEFAULT))
+  // SD_MMC.setPins(12 /* CLK */, 11 /* CMD/MOSI */, 13 /* D0/MISO */, 14 /* D1 */, 15 /* D2 */, 10 /* D3/CS */);
+  // if (!SD_MMC.begin(ROOT, false /* mode1bit */, false /* format_if_mount_failed */, SDMMC_FREQ_HIGHSPEED))
+  {
+    Serial.println(F("ERROR: File System Mount Failed!"));
+    gfx->println(F("ERROR: File System Mount Failed!"));
+  }
+  else
+  {
+    Serial.println(F("MJPEG start"));
+
+    start_ms = millis();
+    curr_ms = millis();
+    if (!mjpeg.setup(MJPEG_FILENAME))
+    {
+      Serial.println(F("mjpeg.setup() failed!"));
+    }
+    else
+    {
+      while (mjpeg.readMjpegBuf())
+      {
+        // Read video
+        total_read_video += millis() - curr_ms;
+        curr_ms = millis();
+
+        // Play video
+        mjpeg.decodeJpg();
+        total_decode_video += millis() - curr_ms;
+        curr_ms = millis();
+
+        if (x == -1)
+        {
+          w = mjpeg.getWidth();
+          h = mjpeg.getHeight();
+          x = (w > gfx->width()) ? 0 : ((gfx->width() - w) / 2);
+          y = (h > gfx->height()) ? 0 : ((gfx->height() - h) / 2);
+        }
+        gfx->draw16bitRGBBitmap(x, y, mjpeg.getOutBuf(), w, h);
+        total_show_video += millis() - curr_ms;
+
+        curr_ms = millis();
+        total_frames++;
+      }
+      int time_used = millis() - start_ms;
+      Serial.println(F("MJPEG end"));
+
+      float fps = 1000.0 * total_frames / time_used;
+      Serial.printf("Arduino_GFX ESP32 SIMD MJPEG decoder\n\n");
+      Serial.printf("Frame size: %d x %d\n", mjpeg.getWidth(), mjpeg.getHeight());
+      Serial.printf("Total frames: %d\n", total_frames);
+      Serial.printf("Time used: %d ms\n", time_used);
+      Serial.printf("Average FPS: %0.1f\n", fps);
+      Serial.printf("Read MJPEG: %lu ms (%0.1f %%)\n", total_read_video, 100.0 * total_read_video / time_used);
+      Serial.printf("Decode video: %lu ms (%0.1f %%)\n", total_decode_video, 100.0 * total_decode_video / time_used);
+      Serial.printf("Show video: %lu ms (%0.1f %%)\n", total_show_video, 100.0 * total_show_video / time_used);
+
+      gfx->setCursor(0, 0);
+      gfx->printf("Arduino_GFX ESP32 SIMD MJPEG decoder\n\n");
+      gfx->printf("Frame size: %d x %d\n", mjpeg.getWidth(), mjpeg.getHeight());
+      gfx->printf("Total frames: %d\n", total_frames);
+      gfx->printf("Time used: %d ms\n", time_used);
+      gfx->printf("Average FPS: %0.1f\n", fps);
+      gfx->printf("Read MJPEG: %lu ms (%0.1f %%)\n", total_read_video, 100.0 * total_read_video / time_used);
+      gfx->printf("Decode video: %lu ms (%0.1f %%)\n", total_decode_video, 100.0 * total_decode_video / time_used);
+      gfx->printf("Show video: %lu ms (%0.1f %%)\n", total_show_video, 100.0 * total_show_video / time_used);
+
+      mjpeg.close();
+    }
+  }
+}
+
+void loop()
+{
+}