FS#6321: Universal Image Viewer

This unifies jpeg viewer, png viewer, and bmp viewer to one plugin, image viewer, so that you can navigate through different image formats.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28626 a1c6a512-1295-4272-9138-f99709370657

apps/plugins/imageviewer/jpeg/SOURCES

@@ -1,4 +1,3 @@
-jpeg_ui.c
 jpeg.c
 jpeg_decoder.c
 #ifdef HAVE_LCD_COLOR

apps/plugins/imageviewer/jpeg/jpeg.c

@@ -69,20 +69,8 @@ static struct jpeg jpg; /* too large for stack */
 
 /************************* Implementation ***************************/
 
-bool img_ext(const char *ext)
-{
-    if(!ext)
-        return false;
-    if(!rb->strcasecmp(ext,".jpg") ||
-       !rb->strcasecmp(ext,".jpe") ||
-       !rb->strcasecmp(ext,".jpeg"))
-            return true;
-    else
-            return false;
-}
-
-void draw_image_rect(struct image_info *info,
-                     int x, int y, int width, int height)
+static void draw_image_rect(struct image_info *info,
+                            int x, int y, int width, int height)
 {
     struct t_disp* pdisp = (struct t_disp*)info->data;
 #ifdef HAVE_LCD_COLOR
@@ -92,7 +80,7 @@ void draw_image_rect(struct image_info *info,
         x + MAX(0, (LCD_WIDTH - info->width) / 2),
         y + MAX(0, (LCD_HEIGHT - info->height) / 2),
         width, height,
-        settings.jpeg_colour_mode, settings.jpeg_dither_mode);
+        iv->settings->jpeg_colour_mode, iv->settings->jpeg_dither_mode);
 #else
     mylcd_ub_gray_bitmap_part(
         pdisp->bitmap[0], info->x + x, info->y + y, pdisp->stride,
@@ -102,7 +90,7 @@ void draw_image_rect(struct image_info *info,
 #endif
 }
 
-int img_mem(int ds)
+static int img_mem(int ds)
 {
     int size;
     struct jpeg *p_jpg = &jpg;
@@ -121,8 +109,8 @@ int img_mem(int ds)
     return size;
 }
 
-int load_image(char *filename, struct image_info *info,
-               unsigned char *buf, ssize_t *buf_size)
+static int load_image(char *filename, struct image_info *info,
+                      unsigned char *buf, ssize_t *buf_size)
 {
     int fd;
     int filesize;
@@ -154,7 +142,7 @@ int load_image(char *filename, struct image_info *info,
         return PLUGIN_OUTOFMEM;
     }
 
-    if(!running_slideshow)
+    if(!iv->running_slideshow)
     {
         rb->lcd_puts(0, 0, rb->strrchr(filename,'/')+1);
         rb->lcd_putsf(0, 1, "loading %d bytes", filesize);
@@ -164,13 +152,13 @@ int load_image(char *filename, struct image_info *info,
     rb->read(fd, buf_jpeg, filesize);
     rb->close(fd);
 
-    if(!running_slideshow)
+    if(!iv->running_slideshow)
     {
         rb->lcd_puts(0, 2, "decoding markers");
         rb->lcd_update();
     }
 #ifdef DISK_SPINDOWN
-    else if(immediate_ata_off)
+    else if(iv->immediate_ata_off)
     {
         /* running slideshow and time is long enough: power down disk */
         rb->storage_sleep();
@@ -190,7 +178,7 @@ int load_image(char *filename, struct image_info *info,
         default_huff_tbl(p_jpg); /* use default */
     build_lut(p_jpg); /* derive Huffman and other lookup-tables */
 
-    if(!running_slideshow)
+    if(!iv->running_slideshow)
     {
         rb->lcd_putsf(0, 2, "image %dx%d", p_jpg->x_size, p_jpg->y_size);
         rb->lcd_update();
@@ -202,7 +190,7 @@ int load_image(char *filename, struct image_info *info,
     return PLUGIN_OK;
 }
 
-int get_image(struct image_info *info, int ds)
+static int get_image(struct image_info *info, int ds)
 {
     int w, h; /* used to center output */
     int size; /* decompressed image size */
@@ -262,7 +250,7 @@ int get_image(struct image_info *info, int ds)
     buf_images += size;
     buf_images_size -= size;
 
-    if(!running_slideshow)
+    if(!iv->running_slideshow)
     {
         rb->lcd_putsf(0, 3, "decoding %d*%d", info->width, info->height);
         rb->lcd_update();
@@ -275,10 +263,10 @@ int get_image(struct image_info *info, int ds)
     time = *rb->current_tick;
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
     rb->cpu_boost(true);
-    status = jpeg_decode(p_jpg, p_disp->bitmap, ds, cb_progress);
+    status = jpeg_decode(p_jpg, p_disp->bitmap, ds, iv->cb_progress);
     rb->cpu_boost(false);
 #else
-    status = jpeg_decode(p_jpg, p_disp->bitmap, ds, cb_progress);
+    status = jpeg_decode(p_jpg, p_disp->bitmap, ds, iv->cb_progress);
 #endif
     if (status)
     {
@@ -287,7 +275,7 @@ int get_image(struct image_info *info, int ds)
     }
     time = *rb->current_tick - time;
 
-    if(!running_slideshow)
+    if(!iv->running_slideshow)
     {
         rb->snprintf(print, sizeof(print), " %ld.%02ld sec ", time/HZ, time%HZ);
         rb->lcd_getstringsize(print, &w, &h); /* centered in progress bar */
@@ -297,3 +285,13 @@ int get_image(struct image_info *info, int ds)
 
     return PLUGIN_OK;
 }
+
+const struct image_decoder image_decoder = {
+    false,
+    img_mem,
+    load_image,
+    get_image,
+    draw_image_rect,
+};
+
+IMGDEC_HEADER

apps/plugins/imageviewer/jpeg/jpeg.make

@@ -10,12 +10,18 @@
 JPEGSRCDIR := $(IMGVSRCDIR)/jpeg
 JPEGBUILDDIR := $(IMGVBUILDDIR)/jpeg
 
-ROCKS += $(JPEGBUILDDIR)/jpeg.rock
-
 JPEG_SRC := $(call preprocess, $(JPEGSRCDIR)/SOURCES)
 JPEG_OBJ := $(call c2obj, $(JPEG_SRC))
 
-# add source files to OTHER_SRC to get automatic dependencies
 OTHER_SRC += $(JPEG_SRC)
 
-$(JPEGBUILDDIR)/jpeg.rock: $(JPEG_OBJ)
+ROCKS += $(JPEGBUILDDIR)/jpeg.ovl
+
+$(JPEGBUILDDIR)/jpeg.refmap: $(JPEG_OBJ)
+$(JPEGBUILDDIR)/jpeg.link: $(PLUGIN_LDS) $(JPEGBUILDDIR)/jpeg.refmap
+$(JPEGBUILDDIR)/jpeg.ovl: $(JPEG_OBJ)
+
+# special pattern rule for compiling image decoder with extra flags
+$(JPEGBUILDDIR)/%.o: $(JPEGSRCDIR)/%.c $(JPEGSRCDIR)/jpeg.make
+	$(SILENT)mkdir -p $(dir $@)
+	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(IMGDECFLAGS) -c $< -o $@

apps/plugins/imageviewer/jpeg/jpeg_ui.c

@@ -1,5 +0,0 @@
-#define JPEG_VIEWER
-#define MENU_TITLE "Jpeg Menu"
-#define UNSCALED_IS_AVAILABLE 0
-
-#include "../imageviewer.c"