Bitmap and JPEG Demo

Diff: main.cpp

Revision:

1:84fb3e9adaaf

Parent:

0:9ecf49d75058

Child:

2:1e1dd697d12d

Child:

11:0c2ff405c1c1

--- a/main.cpp	Wed Apr 27 01:30:31 2016 +0000
+++ b/main.cpp	Sun May 15 18:57:36 2016 +0000
@@ -13,6 +13,42 @@
 #include "WebColors.h"
 #include <algorithm>
 
+#define JPEG_TEST
+
+#define DEBUG "Main"
+// ...
+// INFO("Stuff to show %d", var); // new-line is automatically appended
+//
+#if (defined(DEBUG) && !defined(TARGET_LPC11U24))
+#define INFO(x, ...) std::printf("[INF %s %4d] "x"\r\n", DEBUG, __LINE__, ##__VA_ARGS__);
+#define WARN(x, ...) std::printf("[WRN %s %4d] "x"\r\n", DEBUG, __LINE__, ##__VA_ARGS__);
+#define ERR(x, ...)  std::printf("[ERR %s %4d] "x"\r\n", DEBUG, __LINE__, ##__VA_ARGS__);
+static void HexDump(const char * title, const uint8_t * p, int count)
+{
+    int i;
+    char buf[100] = "0000: ";
+
+    if (*title)
+        INFO("%s", title);
+    for (i=0; i<count; ) {
+        sprintf(buf + strlen(buf), "%02X ", *(p+i));
+        if ((++i & 0x0F) == 0x00) {
+            INFO("%s", buf);
+            if (i < count)
+                sprintf(buf, "%04X: ", i);
+            else
+                buf[0] = '\0';
+        }
+    }
+    if (strlen(buf))
+        INFO("%s", buf);
+}
+#else
+#define INFO(x, ...)
+#define WARN(x, ...)
+#define ERR(x, ...)
+#define HexDump(a, b, c)
+#endif
 
 RA8875 lcd(p5, p6, p7, p12, NC, "tft");     // MOSI, MISO, SCK, /ChipSelect, /reset, name
 Serial pc(USBTX, USBRX);
@@ -42,13 +78,94 @@
 #define SCREEN_H 272
 #define SCREEN_BPP 16
 
+#ifdef JPEG_TEST
+#include "tjpgd.h"
+JDEC jdec;
+#define JPEG_WORK_SPACE_SIZE 3100
+uint16_t work[JPEG_WORK_SPACE_SIZE/sizeof(uint16_t)];
+FILE *fh;
+
+uint16_t jpeg_input_func(JDEC *jd, uint8_t *buff, uint16_t ndata)
+{
+    //INFO("Read in %p count %d", buff, ndata);
+    if (buff) {
+        size_t n = fread(buff, 1, ndata, fh);
+        //INFO("fread returned %d", n);
+        //HexDump("buf", buff, (ndata > 32) ? 32 : ndata);
+        return n == (size_t)-1 ? 0 : n;
+    } else {
+        off_t t = fseek(fh, ndata, SEEK_CUR);
+        //INFO("Seek returned %d", t);
+        return t == (off_t)-1 ? 0 : ndata;
+    }
+}
+
+uint16_t jpeg_output_func(JDEC *jd, void *bitmap, JRECT *rect)
+{
+    #if JD_FORMAT == 1
+    uint16_t *src = (uint16_t *)bitmap;
+    #else
+    uint8_t *src = (uint8_t *)bitmap;
+    #endif
+    int x0 = rect->left;
+    int x1 = rect->right;
+    int y0 = rect->top;
+    int y1 = rect->bottom;
+ 
+    if (y0 >= lcd.height() || x0 >= lcd.width())
+        return 1;
+ 
+    if (x1 > lcd.width()-1) x1 = lcd.width() - 1;
+    if (y1 > lcd.height()-1) y1 = lcd.height() - 1;
+ 
+    if (x0 == 0)
+        printf("\r %d", y0);
+ 
+    int w = x1 - x0 + 1;
+    for (int y= y0; y <= y1; y++) {
+        lcd.SetGraphicsCursor(x0, y);
+        lcd._StartGraphicsStream();
+        #if JD_FORMAT == 1
+        uint16_t *p = src + w * (y - y0);
+        #else
+        uint8_t *p = src + 3 * (w * (y - y0));
+        #endif
+        for (int x=x0; x <= x1; x++) {
+            #if JD_FORMAT == 1
+            lcd._putp(*p++);
+            #else
+            lcd._putp(RGB(*p, *(p+1), *(p+2)));
+            p += 3;
+            #endif
+        }
+        lcd._EndGraphicsStream();
+    }
+    return 1;
+}
+#endif
+
+
 int main()
 {
     pc.baud(460800);    // I like a snappy terminal, so crank it up!
     pc.printf("\r\nRA8875 Bitmap Test - Build " __DATE__ " " __TIME__ "\r\n");
 
     lcd.init(SCREEN_W, SCREEN_H, SCREEN_BPP);
-    
+
+#ifdef JPEG_TEST
+    const char * path = "/local/testimg.jpg";
+    fh = fopen(path, "rb");
+    if (fh == NULL) error("%s not found.", path);
+
+    JRESULT r = jd_prepare(&jdec, jpeg_input_func, work, JPEG_WORK_SPACE_SIZE, fh);
+    if(r != JDR_OK) error("jd_prepare error:%d", r);
+    r = jd_decomp(&jdec, jpeg_output_func, 0);
+    fclose(fh);
+    if( r != JDR_OK) error("jd_decomp error:%d", r);    
+    pc.printf("done.\r\n");
+    while (1)
+        ;
+#else
     int count = sizeof(TestImage)/sizeof(TestImage[0]);
     for (int i=0; i<count; i++) {
         lcd.cls();
@@ -57,4 +174,5 @@
         printf("returned %d\r\n", r);
         wait(5);
     }
+#endif    
 }