Make scaler output truly pluggable, add an 8-bit greyscale output to

pluginlib for use with greylib, and add source for a test scaled bmp
viewer using greylib.

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

8 files changed, 27 insertions, 4 deletions

diff --git a/apps/plugins/CATEGORIES b/apps/plugins/CATEGORIES
index 750d149..09a4476 100644
--- a/apps/plugins/CATEGORIES
+++ b/apps/plugins/CATEGORIES
@@ -92,6 +92,7 @@ test_sampr,apps
 test_scanrate,apps
 test_touchscreen,apps
 test_viewports,apps
+test_greylib_bitmap_scale,viewers
 text_editor,apps
 vbrfix,viewers
 video,viewers
diff --git a/apps/plugins/lib/grey.h b/apps/plugins/lib/grey.h
index 8f8de9d..8c9d40a 100644
--- a/apps/plugins/lib/grey.h
+++ b/apps/plugins/lib/grey.h
@@ -106,6 +106,7 @@ void grey_ub_gray_bitmap_part(const unsigned char *src, int src_x, int src_y,
                               int stride, int x, int y, int width, int height);
 void grey_ub_gray_bitmap(const unsigned char *src, int x, int y, int width,
                          int height);
+extern const struct custom_format format_grey;
 
 /* Text */
 void grey_putsxyofs(int x, int y, int ofs, const unsigned char *str);
diff --git a/apps/plugins/lib/grey_draw.c b/apps/plugins/lib/grey_draw.c
index e9812b6..51d340d 100644
--- a/apps/plugins/lib/grey_draw.c
+++ b/apps/plugins/lib/grey_draw.c
@@ -669,3 +669,22 @@ void grey_ub_gray_bitmap(const unsigned char *src, int x, int y, int width,
 {
     grey_ub_gray_bitmap_part(src, 0, 0, width, x, y, width, height);
 }
+
+static void output_row_grey(uint32_t row, void * row_in, struct scaler_context *ctx)
+{
+    int col;
+    uint32_t *qp = (uint32_t*)row_in;
+    uint8_t *dest = (uint8_t*)ctx->bm->data + ctx->bm->width * row;
+    for (col = 0; col < ctx->bm->width; col++)
+        *dest++ = ((*qp++) + ctx->round) * (uint64_t)ctx->divisor >> 32;
+}
+
+static unsigned int get_size_grey(struct bitmap *bm)
+{
+    return bm->width * bm->height;
+}
+
+const struct custom_format format_grey = {
+    .output_row = output_row_grey,
+    .get_size = get_size_grey
+};
diff --git a/apps/plugins/pictureflow.c b/apps/plugins/pictureflow.c
index 150d882..0dd9f92 100644
--- a/apps/plugins/pictureflow.c
+++ b/apps/plugins/pictureflow.c
@@ -636,7 +636,7 @@ bool create_albumart_cache(bool force)
         input_bmp.data = (char *)input_bmp_buffer;
         ret = rb->read_bmp_file(arlbumart_file, &input_bmp,
                                 sizeof(fb_data)*MAX_IMG_WIDTH*MAX_IMG_HEIGHT,
-                                FORMAT_NATIVE);
+                                FORMAT_NATIVE, NULL);
         if (ret <= 0) {
             rb->splash(HZ, "Could not read bmp");
             continue; /* skip missing/broken files */
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c
index 300821b..40d1910 100644
--- a/apps/plugins/rockpaint.c
+++ b/apps/plugins/rockpaint.c
@@ -2967,7 +2967,7 @@ static int load_bitmap( const char *file )
 
     bm.data = (char*)save_buffer;
     ret = rb->read_bmp_file( file, &bm, ROWS*COLS*sizeof( fb_data ),
-                             FORMAT_NATIVE );
+                             FORMAT_NATIVE, NULL );
 
     if((bm.width > COLS ) || ( bm.height > ROWS ))
         return -1;
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c
index fa9e093..8a607c9 100644
--- a/apps/plugins/sliding_puzzle.c
+++ b/apps/plugins/sliding_puzzle.c
@@ -340,7 +340,8 @@ static bool load_resize_bitmap(void)
 
         rc = rb->read_bmp_file( filename, &main_bitmap,
                                 sizeof(img_buf),
-                                FORMAT_NATIVE|FORMAT_RESIZE|FORMAT_DITHER);
+                                FORMAT_NATIVE|FORMAT_RESIZE|FORMAT_DITHER,
+                                NULL);
         if( rc > 0 )
         {
             puzzle_bmp_ptr = (const fb_data *)img_buf;
diff --git a/apps/plugins/test_resize.c b/apps/plugins/test_resize.c
index b0ef787..a608005 100644
--- a/apps/plugins/test_resize.c
+++ b/apps/plugins/test_resize.c
@@ -78,7 +78,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame
     output_bmp.data = (char*)output_bmp_data;
 
     int ret = rb->read_bmp_file("/test.bmp", &input_bmp, sizeof(input_bmp_data),
-                                FORMAT_NATIVE);
+                                FORMAT_NATIVE, NULL);
 
     if (ret < 0) {
         rb->splash(HZ, "Could not load /test.bmp");
diff --git a/apps/plugins/viewers.config b/apps/plugins/viewers.config
index e2babf6..2ec8fe9 100644
--- a/apps/plugins/viewers.config
+++ b/apps/plugins/viewers.config
@@ -25,6 +25,7 @@ wav,viewers/mp3_encoder,-
 wav,viewers/wavplay,9
 wav,viewers/wavview,10
 wav,viewers/test_codec,-
+bmp,viewers/test_greylib_bitmap_scale,-
 bmp,apps/rockpaint,11
 bmp,games/sliding_puzzle,11
 mpg,viewers/mpegplayer,4