H300: * Implemented lcd_yuv_blit(). Speeds up video playback by about 7%. No bounds check in lcd_yuv_blit() (by convention), implementations for other targets should be adapted. * Fixed off-by-one bug in lcd_update_rect()

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

3 files changed, 22 insertions, 16 deletions

diff --git a/apps/plugin.c b/apps/plugin.c
index 4474d0d5ee..bbc5d7d15c 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -463,8 +463,8 @@ static const struct plugin_api rockbox_api = {
     lcd_remote_bitmap,
 #endif
 
-#if (CONFIG_LCD == LCD_IPODCOLOR || CONFIG_LCD == LCD_IPODNANO) && \
-    !defined(SIMULATOR)
+#if (CONFIG_LCD == LCD_IPODCOLOR || CONFIG_LCD == LCD_IPODNANO \
+     || CONFIG_LCD == LCD_H300) && !defined(SIMULATOR)
     lcd_yuv_blit,
 #endif
 
diff --git a/apps/plugin.h b/apps/plugin.h
index b764d860c3..f43e0ae08b 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -104,7 +104,7 @@
 #define PLUGIN_MAGIC 0x526F634B /* RocK */
 
 /* increase this every time the api struct changes */
-#define PLUGIN_API_VERSION 27
+#define PLUGIN_API_VERSION 28
 
 /* update this to latest version if a change to the api struct breaks
    backwards compatibility (and please take the opportunity to sort in any
@@ -539,8 +539,8 @@ struct plugin_api {
     void (*lcd_remote_bitmap)(const fb_remote_data *src, int x, int y, int width,
                               int height);
 #endif
-#if (CONFIG_LCD == LCD_IPODCOLOR || CONFIG_LCD == LCD_IPODNANO) && \
-    !defined(SIMULATOR)
+#if (CONFIG_LCD == LCD_IPODCOLOR || CONFIG_LCD == LCD_IPODNANO \
+     || CONFIG_LCD == LCD_H300) &&  !defined(SIMULATOR)
     void (*lcd_yuv_blit)(unsigned char * const src[3],
                          int src_x, int src_y, int stride,
                          int x, int y, int width, int height);
diff --git a/apps/plugins/mpegplayer/video_out_rockbox.c b/apps/plugins/mpegplayer/video_out_rockbox.c
index 786d9d0e14..a5fdf5efbb 100644
--- a/apps/plugins/mpegplayer/video_out_rockbox.c
+++ b/apps/plugins/mpegplayer/video_out_rockbox.c
@@ -35,12 +35,14 @@ static int starttick;
 #define CSUB_X 2
 #define CSUB_Y 2
 
-static int image_x;
-static int image_y;
 static int image_width;
 static int image_height;
 static int image_chroma_x;
 static int image_chroma_y;
+static int output_x;
+static int output_y;
+static int output_width;
+static int output_height;
 
 #if (LCD_DEPTH == 16) && \
     ((LCD_PIXELFORMAT == RGB565) || (LCD_PIXELFORMAT == RGB565SWAPPED))
@@ -197,16 +199,16 @@ static void rockbox_draw_frame (vo_instance_t * instance,
     (void)id;
     (void)instance;
 
-#if (CONFIG_LCD == LCD_IPODCOLOR || CONFIG_LCD == LCD_IPODNANO) && \
-    !defined(SIMULATOR)
+#if (CONFIG_LCD == LCD_IPODCOLOR || CONFIG_LCD == LCD_IPODNANO \
+     || CONFIG_LCD == LCD_H300) && !defined(SIMULATOR)
     rb->lcd_yuv_blit(buf,
                     0,0,image_width,
-                    image_x,image_y,image_width,image_height);
+                    output_x,output_y,output_width,output_height);
 #elif (LCD_DEPTH == 16) && \
     ((LCD_PIXELFORMAT == RGB565) || (LCD_PIXELFORMAT == RGB565SWAPPED))
     yuv_bitmap_part(buf,0,0,image_width,
-                    image_x,image_y,image_width,image_height);
-    rb->lcd_update_rect(image_x,image_y,image_width,image_height);
+                    output_x,output_y,output_width,output_height);
+    rb->lcd_update_rect(output_x,output_y,output_width,output_height);
 #endif
 
     if (starttick==0) starttick=*rb->current_tick-1; /* Avoid divby0 */
@@ -265,15 +267,19 @@ static int rockbox_setup (vo_instance_t * instance, unsigned int width,
     image_chroma_y=image_height/chroma_height;
 
     if (image_width >= LCD_WIDTH) {
-        image_x = 0;
+        output_width = LCD_WIDTH;
+        output_x = 0;
     } else {
-        image_x = (LCD_WIDTH-image_width)/2;
+        output_width = image_width;
+        output_x = (LCD_WIDTH-image_width)/2;
     }
 
     if (image_height >= LCD_HEIGHT) {
-        image_y = 0;
+        output_height = LCD_HEIGHT;
+        output_y = 0;
     } else {
-        image_y = (LCD_HEIGHT-image_height)/2;
+        output_height = image_height;
+        output_y = (LCD_HEIGHT-image_height)/2;
     }
 
     return 0;