CES: update example to load from QSPI flash

Author: facchinm

examples/Demo_CES_mjpeg/AVI_parser.c

@@ -245,6 +245,7 @@ AVISTATUS __AVI_Init( AVI_CONTEXT * pavi, uint8_t *buf, uint32_t size)
 
     if (strhheader->StreamType != AVI_VIDS_STREAM)
     {
+      printf("Got %d %x strhheader->StreamType\n", strhheader->StreamType, strhheader->StreamType);
       return AVI_FORMAT_ERR;
     }
 

examples/Demo_CES_mjpeg/Demo_CES_mjpeg.ino

@@ -14,7 +14,7 @@ mbed::DigitalOut video_rst(PJ_3);
 
 extern "C" uint32_t JPEG_Decode_DMA(JPEG_HandleTypeDef *hjpeg, uint32_t FrameSourceAddress , uint32_t FrameSize, uint32_t DestAddress);
 
-static uint32_t AVI_FILE_ADDRESS = ((uint32_t)(0x90000000)); // start of qspi flash, correct me later
+static uint32_t AVI_FILE_ADDRESS = ((uint32_t)(0x90000000) + (2048 * 4096)); // start of qspi flash, correct me later
 
 /* Private macro -------------------------------------------------------------*/
 /* Private variables ---------------------------------------------------------*/
@@ -62,6 +62,7 @@ void setup() {
 
   delay(1000);
 
+/*
   QSPIFBlockDevice* block_device = new QSPIFBlockDevice(PD_11, PD_12, PF_7, PD_13,
       PF_10, PG_6, QSPIF_POLARITY_MODE_0, MBED_CONF_QSPIF_QSPI_FREQ);
   block_device->init();
@@ -74,29 +75,35 @@ void setup() {
 
   printf("QSPIF BD erase size (at address 0): %llu\n", sector_size_at_address_0);
 
-  /*
     char avi_header[] = {0x52, 0x49, 0x46, 0x46};
     char *buffer = (char *) malloc(sector_size_at_address_0);
-    int i = 2048;
+    int i = 0;
     int res = 0;
-    while (sector_size_at_address_0 * i < block_device.size()) {
-      block_device.read(buffer, sector_size_at_address_0 * i, sector_size_at_address_0);
+    while (sector_size_at_address_0 * i < block_device->size()) {
+      block_device->read(buffer, i, sector_size_at_address_0);
       res = KMP(avi_header, 4, buffer, sector_size_at_address_0);
       if (res != -1) {
-         break;
+        break;
       }
       i++;
     }
-  */
+
   char *buffer = (char *) malloc(sector_size_at_address_0);
-  block_device->read(buffer, 2048 * 4096, sector_size_at_address_0);
+  block_device->read(buffer, 0, sector_size_at_address_0);
+*/
+
+  //AVI_FILE_ADDRESS = (((uint32_t)(ardulogo_avi)));
+ //  DumpHex((void*)buffer, 40);
+
+  AVI_FILE_ADDRESS = ((uint32_t)(0x90000000));
+  //AVI_FILE_ADDRESS = (((uint32_t)(video_envie_avi)));
+
+  DumpHex((void*)AVI_FILE_ADDRESS + 0x3210, 40);
 
-  AVI_FILE_ADDRESS = (((uint32_t)(EnvieH7V1_0_4_avi))); // + (2048 * 4096))));
-  //DumpHex((void*)AVI_FILE_ADDRESS, 40);
   printf("Address: %x\n",  AVI_FILE_ADDRESS);
 
   // Deinitialize the device
-  block_device->deinit();
+  //block_device->deinit();
 
   LCD_X_Size = stm32_getXSize();
   LCD_Y_Size = stm32_getYSize();
@@ -226,6 +233,11 @@ void loop() {
           /*##-7- Get JPEG Info  #############################################*/
           HAL_JPEG_GetInfo(&JPEG_Handle, &JPEG_Info);
 
+          printf("ChromaSubsampling: %x\n", JPEG_Info.ChromaSubsampling);
+          printf("w/h: %d : %d\n", JPEG_Info.ImageWidth, JPEG_Info.ImageHeight);
+          printf("ImageQuality: %d\n", JPEG_Info.ImageQuality);
+          printf("Colorspace: %d\n", JPEG_Info.ColorSpace);
+
           /*##-8- Initialize the DMA2D #######################################*/
           DMA2D_Init(JPEG_Info.ImageWidth, JPEG_Info.ImageHeight, JPEG_Info.ChromaSubsampling);
         }

examples/Demo_CES_mjpeg/config.h

@@ -12,11 +12,11 @@
 #define MDMA_INSTANCE MDMA_Channel0
 
 #define LCD_FRAME_BUFFER            0xC0000000
-#define JPEG_OUTPUT_DATA_BUFFER0    0xC0400000
-#define JPEG_OUTPUT_DATA_BUFFER1    0xC0600000
+#define JPEG_OUTPUT_DATA_BUFFER0    0xC0200000
+#define JPEG_OUTPUT_DATA_BUFFER1    0xC0500000
 
 /*uncomment this line to regulate the decoding frame rate to the native video frame rate */
-//#define USE_FRAMERATE_REGULATION
+#define USE_FRAMERATE_REGULATION
 
 #endif /* __MAIN_H */
 

examples/Demo_CES_mjpeg/decode_dma.c

@@ -137,6 +137,7 @@ void HAL_JPEG_DataReadyCallback (JPEG_HandleTypeDef *hjpeg, uint8_t *pDataOut, u
 */
 void HAL_JPEG_ErrorCallback(JPEG_HandleTypeDef *hjpeg)
 {
+  printf("HAL_JPEG_ErrorCallback\n");
   Jpeg_HWDecodingEnd = 1;
 }