Archives/device-epd
2
0
Fork 0
mirror of https://github.com/paperdash/device-epd.git synced 2024-11-04 12:00:27 +00:00
Code Issues Projects Releases Wiki Activity

code clean up

Browse Source
This commit is contained in:
Thomas Ballmann 2020-05-10 09:40:14 +02:00
parent f4b78d188f
commit 380d16baf4
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/imageJPEG.cpp
View File

@ -7,8 +7,8 @@
File tmpFileBuffer; File tmpFileBuffer;
void renderMcuBlock(int16_t x, int16_t y, uint16_t w, uint16_t h, uint16_t *bitmap); void renderMcuBlock(int16_t x, int16_t y, uint16_t w, uint16_t h, uint16_t *bitmap);
static constexpr int MAX_WIDTH = 640; // TODO get info from display static constexpr int MAX_WIDTH = 640; // TODO get info from display
static constexpr uint8_t BLOCK_SIZE = 16; // max MCU block size static constexpr uint8_t BLOCK_SIZE = 16; // max MCU block size
static uint32_t blockDelta[BLOCK_SIZE * MAX_WIDTH + 1]; static uint32_t blockDelta[BLOCK_SIZE * MAX_WIDTH + 1];
#define minimum(a, b) (((a) < (b)) ? (a) : (b)) #define minimum(a, b) (((a) < (b)) ? (a) : (b))
@ -151,17 +151,16 @@ void jpegFlushFramebuffer()
// initialise the decoder to give access to image information // initialise the decoder to give access to image information
int ret = JpegDec.decodeFile("/tmp.jpeg"); int ret = JpegDec.decodeFile("/tmp.jpeg");
if (ret == 1) { if (ret == 1)
Serial.print("decodeFile ret = "); {
Serial.println(ret);
// print information about the image to the serial port // print information about the image to the serial port
jpegInfo(); //jpegInfo();
// render the image onto the screen at coordinate 0,0 // render the image onto the screen at coordinate 0,0
renderJPEG(0, 0); renderJPEG(0, 0);
}
} else { else
{
Serial.println("!!!! unkown jpeg format !!!!"); Serial.println("!!!! unkown jpeg format !!!!");
} }
@ -176,9 +175,9 @@ void renderMcuBlockPixel(uint32_t x, uint32_t y, uint32_t color)
uint32_t blockPageY = y - ((y / JpegDec.MCUHeight) * JpegDec.MCUHeight); uint32_t blockPageY = y - ((y / JpegDec.MCUHeight) * JpegDec.MCUHeight);
blockDelta[(blockPageY * MAX_WIDTH) + x] = color; blockDelta[(blockPageY * MAX_WIDTH) + x] = color;
// full mcu row is complete now // full mcu row is complete now
if (x == JpegDec.width -1 && (y +1) % JpegDec.MCUHeight == 0) { if (x == JpegDec.width - 1 && (y + 1) % JpegDec.MCUHeight == 0)
{
// MCU block sizes: 8x8, 16x8 or 16x16 // MCU block sizes: 8x8, 16x8 or 16x16
uint32_t originOffsetY = ((y / JpegDec.MCUHeight) * JpegDec.MCUHeight); uint32_t originOffsetY = ((y / JpegDec.MCUHeight) * JpegDec.MCUHeight);