imageviewer: Use jpeg progressive decoder only for progressive jpeg

As new decoder has no optimizations for small memory targets

Change-Id: I7d4c06bdfc22d76883e2eb16cbd97ed4b3824161

Author: bahusoid

apps/plugins/imageviewer/image_decoder.c

@@ -25,12 +25,13 @@
 
 static const char *decoder_names[MAX_IMAGE_TYPES] = {
     "bmp",
-    "jpegp", // Use jpeg for old decoder, jpegp for new
+    "jpeg", // Default decoder for jpeg: Use jpeg for old decoder, jpegp for new
     "png",
 #ifdef HAVE_LCD_COLOR
     "ppm",
 #endif
-    "gif"
+    "gif",
+    "jpegp",
 };
 
 /* Check file type by magic number or file extension

apps/plugins/imageviewer/image_decoder.h

@@ -33,6 +33,7 @@ enum image_type {
     IMAGE_PPM,
 #endif
     IMAGE_GIF,
+    IMAGE_JPEG_PROGRESSIVE,
     MAX_IMAGE_TYPES
 };
 

apps/plugins/imageviewer/imageviewer.c

@@ -855,6 +855,8 @@ static int load_and_show(char* filename, struct image_info *info)
     }
     if (image_type != status) /* type of image is changed, load decoder. */
     {
+        reload_decoder:;
+
         struct loader_info loader_info = {
             status, &iv_api, decoder_buf, decoder_buf_size,
         };
@@ -881,6 +883,13 @@ static int load_and_show(char* filename, struct image_info *info)
     else
         status = imgdec->load_image(filename, info, buf, &remaining);
 
+    if (status == PLUGIN_JPEG_PROGRESSIVE)
+    {
+        release_decoder();
+        status = IMAGE_JPEG_PROGRESSIVE;
+        goto reload_decoder;
+    }
+
     if (status == PLUGIN_OUTOFMEM)
     {
 #ifdef USE_PLUG_BUF

apps/plugins/imageviewer/imageviewer.h

@@ -55,6 +55,7 @@ enum {
     PLUGIN_OTHER = 0x200,
     PLUGIN_ABORT,
     PLUGIN_OUTOFMEM,
+    PLUGIN_JPEG_PROGRESSIVE,
 
     ZOOM_IN,
     ZOOM_OUT,

apps/plugins/imageviewer/jpeg/jpeg.c

@@ -170,8 +170,8 @@ static int load_image(char *filename, struct image_info *info,
 
     if (status < 0 || (status & (DQT | SOF0)) != (DQT | SOF0))
     {   /* bad format or minimum components not contained */
-        rb->splashf(HZ, "unsupported %d", status);
-        return PLUGIN_ERROR;
+        //rb->splashf(HZ, "unsupported %d", status);
+        return PLUGIN_JPEG_PROGRESSIVE;
     }
 
     if (!(status & DHT)) /* if no Huffman table present: */