KSM edits to RA8875
Diff: GraphicsDisplayJPEG.cpp
- Revision:
- 118:34eb0b64fc61
- Parent:
- 117:6710b8e196f0
- Child:
- 119:d129b798f82f
--- a/GraphicsDisplayJPEG.cpp Mon May 16 10:58:12 2016 +0000 +++ b/GraphicsDisplayJPEG.cpp Mon May 16 11:20:07 2016 +0000 @@ -264,9 +264,9 @@ ERR("JDR_MEM1"); return JDR_MEM1; /* Err: not enough memory */ } - INFO("jd->pool: %p", jd->pool); + //INFO("jd->pool: %p", jd->pool); jd->huffcode[num][cls] = ph; - INFO("jd->pool: %p, %p", jd->pool, ph); + //INFO("jd->pool: %p, %p", jd->pool, ph); hc = 0; for (j = i = 0; i < 16; i++) { /* Re-build huffman code word table */ b = pb[i]; @@ -274,13 +274,13 @@ hc <<= 1; INFO("jd->pool: %d: %p, %p", i, jd->pool, ph); } - INFO("jd->pool: %p", jd->pool); + //INFO("jd->pool: %p", jd->pool); if (ndata < np) return JDR_FMT1; /* Err: wrong data size */ ndata -= np; - INFO("jd->pool: %p", jd->pool); + //INFO("jd->pool: %p", jd->pool); pd = (uint8_t *)alloc_pool(jd, np); /* Allocate a memory block for the decoded data */ - INFO("jd->pool: %p", jd->pool); + //INFO("jd->pool: %p", jd->pool); if (!pd) { ERR("JDR_MEM1"); return JDR_MEM1; /* Err: not enough memory */ @@ -539,7 +539,9 @@ const uint16_t *hc; const int32_t *dqf; - + INFO("mcu_load"); + HexDump("JDEC", (uint8_t *)jd, sizeof(JDEC)); + nby = jd->msx * jd->msy; /* Number of Y blocks (1, 2 or 4) */ nbc = 2; /* Number of C blocks (2) */ bp = jd->mcubuf; /* Pointer to the first block */ @@ -622,6 +624,9 @@ uint8_t *py, *pc, *rgb24; JRECT rect; + INFO("mcu_output(%p,%p,%d,%d)", jd, outfunc, x, y); + HexDump("JDEC", (uint8_t *)jd, sizeof(JDEC)); + mx = jd->msx * 8; my = jd->msy * 8; /* MCU size (pixel) */ rx = (x + mx <= jd->width) ? mx : jd->width - x; /* Output rectangular size (it may be clipped at right/bottom end) */ ry = (y + my <= jd->height) ? my : jd->height - y; @@ -770,6 +775,7 @@ uint16_t i, dc; uint16_t d; uint8_t *dp; + INFO("restart(%p,%d)", jd, rstn); /* Discard padding bits and get two bytes from the input stream */ @@ -888,7 +894,9 @@ uint16_t n, i, j, len; JRESULT rc; - INFO("jd_prepare()"); + INFO("jd_prepare(%p,%p,%p,%d,%p)"); + HexDump("JDEC", (uint8_t *)jd, sizeof(JDEC)); + if (!pool) { ERR("JDR_PAR"); return JDR_PAR; @@ -1151,7 +1159,9 @@ uint16_t rst, rsc; JRESULT rc; - INFO("jd_decomp"); + INFO("jd_decomp(%p,%p,%d)", jd, outfunc, scale); + HexDump("JDEC", (uint8_t *)jd, sizeof(JDEC)); + if (scale > (JD_USE_SCALE ? 3 : 0)) return JDR_PAR; jd->scale = scale;