uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Adding GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE configuration option

Browse source
This commit is contained in:
Joel Bodenmann 2017-01-10 10:48:54 +01:00
parent d3fb6b2cb9
commit 12a0f2dd64
4 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.txt
View file

@ -13,6 +13,7 @@ FEATURE: Added GDISP_IMAGE_BMP_BLIT_BUFFER_SIZE configuration option
FEATURE: Added GDISP_IMAGE_PNG_BLIT_BUFFER_SIZE configuration option FEATURE: Added GDISP_IMAGE_PNG_BLIT_BUFFER_SIZE configuration option
FEATURE: Added GDISP_IMAGE_PNG_FILE_BUFFER_SIZE configuration option FEATURE: Added GDISP_IMAGE_PNG_FILE_BUFFER_SIZE configuration option
FEATURE: Added GDISP_IMAGE_PNG_Z_BUFFER_SIZE configuration option FEATURE: Added GDISP_IMAGE_PNG_Z_BUFFER_SIZE configuration option
FEATURE: Added GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE configuration option
*** Release 2.7 *** *** Release 2.7 ***

1
gfxconf.example.h
View file

@ -109,6 +109,7 @@
//#define GDISP_NEED_IMAGE FALSE //#define GDISP_NEED_IMAGE FALSE
// #define GDISP_NEED_IMAGE_NATIVE FALSE // #define GDISP_NEED_IMAGE_NATIVE FALSE
// #define GDISP_NEED_IMAGE_GIF FALSE // #define GDISP_NEED_IMAGE_GIF FALSE
// #define GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE 32
// #define GDISP_NEED_IMAGE_BMP FALSE // #define GDISP_NEED_IMAGE_BMP FALSE
// #define GDISP_NEED_IMAGE_BMP_1 TRUE // #define GDISP_NEED_IMAGE_BMP_1 TRUE
// #define GDISP_NEED_IMAGE_BMP_4 TRUE // #define GDISP_NEED_IMAGE_BMP_4 TRUE

24
src/gdisp/gdisp_image_gif.c
View file

@ -11,12 +11,6 @@
#include "gdisp_image_support.h" #include "gdisp_image_support.h"
/**
* How big an array to allocate for blitting (in pixels)
* Bigger is faster but uses more RAM.
*/
#define BLIT_BUFFER_SIZE_GIF 32
// We need a special error to indicate the end of file (which may not actually be an error) // We need a special error to indicate the end of file (which may not actually be an error)
#define GDISP_IMAGE_GIF_EOF ((gdispImageError)-1) #define GDISP_IMAGE_GIF_EOF ((gdispImageError)-1)
#define GDISP_IMAGE_GIF_LOOP ((gdispImageError)-2) #define GDISP_IMAGE_GIF_LOOP ((gdispImageError)-2)
@ -50,7 +44,7 @@ typedef struct gifimgdecode {
uint16_t code_last; uint16_t code_last;
uint32_t shiftdata; uint32_t shiftdata;
color_t * palette; color_t * palette;
uint8_t buf[BLIT_BUFFER_SIZE_GIF]; // Buffer for decoded pixels uint8_t buf[GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE]; // Buffer for decoded pixels
uint16_t prefix[1<<GIF_MAX_CODE_BITS]; // The LZW table uint16_t prefix[1<<GIF_MAX_CODE_BITS]; // The LZW table
uint8_t suffix[1<<GIF_MAX_CODE_BITS]; // So we can trace the codes uint8_t suffix[1<<GIF_MAX_CODE_BITS]; // So we can trace the codes
uint8_t stack[1<<GIF_MAX_CODE_BITS]; // Decoded pixels might be stacked here uint8_t stack[1<<GIF_MAX_CODE_BITS]; // Decoded pixels might be stacked here
@ -104,7 +98,7 @@ typedef struct gdispImagePrivate_GIF {
gifimgdecode * decode; // The decode data for the decode in progress gifimgdecode * decode; // The decode data for the decode in progress
gifimgframe frame; gifimgframe frame;
gifimgdispose dispose; gifimgdispose dispose;
pixel_t buf[BLIT_BUFFER_SIZE_GIF]; // Buffer for reading and blitting pixel_t buf[GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE]; // Buffer for reading and blitting
} gdispImagePrivate_GIF; } gdispImagePrivate_GIF;
/** /**
@ -203,7 +197,7 @@ static uint16_t getPrefixGif(gifimgdecode *decode, uint16_t code) {
* *
* Pre: We are ready for decoding. * Pre: We are ready for decoding.
* *
* Return: The number of pixels decoded 0 .. BLIT_BUFFER_SIZE_GIF-1. 0 means EOF * Return: The number of pixels decoded 0 .. GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE-1. 0 means EOF
* *
* Note: The resulting pixels are stored in decode->buf * Note: The resulting pixels are stored in decode->buf
*/ */
@ -839,7 +833,7 @@ gdispImageError gdispGImageDraw_GIF(GDisplay *g, gdispImage *img, coord_t x, coo
continue; continue;
} }
priv->buf[gcnt++] = cache->palette[col]; priv->buf[gcnt++] = cache->palette[col];
if (gcnt >= BLIT_BUFFER_SIZE_GIF) { if (gcnt >= GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE) {
// We have run out of buffer - dump it to the display // We have run out of buffer - dump it to the display
gdispGBlitArea(g, x+mx-sx-gcnt+1, y+my-sy, gcnt, 1, 0, 0, gcnt, priv->buf); gdispGBlitArea(g, x+mx-sx-gcnt+1, y+my-sy, gcnt, 1, 0, 0, gcnt, priv->buf);
gcnt = 0; gcnt = 0;
@ -893,7 +887,7 @@ gdispImageError gdispGImageDraw_GIF(GDisplay *g, gdispImage *img, coord_t x, coo
continue; continue;
} }
priv->buf[gcnt++] = decode->palette[col]; priv->buf[gcnt++] = decode->palette[col];
if (gcnt >= BLIT_BUFFER_SIZE_GIF) { if (gcnt >= GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE) {
// We have run out of buffer - dump it to the display // We have run out of buffer - dump it to the display
gdispGBlitArea(g, x+mx-sx-gcnt+1, y+my-sy, gcnt, 1, 0, 0, gcnt, priv->buf); gdispGBlitArea(g, x+mx-sx-gcnt+1, y+my-sy, gcnt, 1, 0, 0, gcnt, priv->buf);
gcnt = 0; gcnt = 0;
@ -939,7 +933,7 @@ gdispImageError gdispGImageDraw_GIF(GDisplay *g, gdispImage *img, coord_t x, coo
continue; continue;
} }
priv->buf[gcnt++] = decode->palette[col]; priv->buf[gcnt++] = decode->palette[col];
if (gcnt >= BLIT_BUFFER_SIZE_GIF) { if (gcnt >= GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE) {
// We have run out of buffer - dump it to the display // We have run out of buffer - dump it to the display
gdispGBlitArea(g, x+mx-sx-gcnt+1, y+my-sy, gcnt, 1, 0, 0, gcnt, priv->buf); gdispGBlitArea(g, x+mx-sx-gcnt+1, y+my-sy, gcnt, 1, 0, 0, gcnt, priv->buf);
gcnt = 0; gcnt = 0;
@ -985,7 +979,7 @@ gdispImageError gdispGImageDraw_GIF(GDisplay *g, gdispImage *img, coord_t x, coo
continue; continue;
} }
priv->buf[gcnt++] = decode->palette[col]; priv->buf[gcnt++] = decode->palette[col];
if (gcnt >= BLIT_BUFFER_SIZE_GIF) { if (gcnt >= GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE) {
// We have run out of buffer - dump it to the display // We have run out of buffer - dump it to the display
gdispGBlitArea(g, x+mx-sx-gcnt+1, y+my-sy, gcnt, 1, 0, 0, gcnt, priv->buf); gdispGBlitArea(g, x+mx-sx-gcnt+1, y+my-sy, gcnt, 1, 0, 0, gcnt, priv->buf);
gcnt = 0; gcnt = 0;
@ -1031,7 +1025,7 @@ gdispImageError gdispGImageDraw_GIF(GDisplay *g, gdispImage *img, coord_t x, coo
continue; continue;
} }
priv->buf[gcnt++] = decode->palette[col]; priv->buf[gcnt++] = decode->palette[col];
if (gcnt >= BLIT_BUFFER_SIZE_GIF) { if (gcnt >= GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE) {
// We have run out of buffer - dump it to the display // We have run out of buffer - dump it to the display
gdispGBlitArea(g, x+mx-sx-gcnt+1, y+my-sy, gcnt, 1, 0, 0, gcnt, priv->buf); gdispGBlitArea(g, x+mx-sx-gcnt+1, y+my-sy, gcnt, 1, 0, 0, gcnt, priv->buf);
gcnt = 0; gcnt = 0;
@ -1078,7 +1072,7 @@ gdispImageError gdispGImageDraw_GIF(GDisplay *g, gdispImage *img, coord_t x, coo
continue; continue;
} }
priv->buf[gcnt++] = decode->palette[col]; priv->buf[gcnt++] = decode->palette[col];
if (gcnt >= BLIT_BUFFER_SIZE_GIF) { if (gcnt >= GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE) {
// We have run out of buffer - dump it to the display // We have run out of buffer - dump it to the display
gdispGBlitArea(g, x+mx-sx-gcnt+1, y+my-sy, gcnt, 1, 0, 0, gcnt, priv->buf); gdispGBlitArea(g, x+mx-sx-gcnt+1, y+my-sy, gcnt, 1, 0, 0, gcnt, priv->buf);
gcnt = 0; gcnt = 0;

15
src/gdisp/gdisp_options.h
View file

@ -397,6 +397,21 @@
#ifndef GDISP_IMAGE_BMP_BLIT_BUFFER_SIZE #ifndef GDISP_IMAGE_BMP_BLIT_BUFFER_SIZE
#define GDISP_IMAGE_BMP_BLIT_BUFFER_SIZE 32 #define GDISP_IMAGE_BMP_BLIT_BUFFER_SIZE 32
#endif #endif
/**
* @}
*
* @name GDISP GIF Image Options
* @pre GDISP_NEED_IMAGE and GDISP_NEED_IMAGE_GIF must be TRUE
* @{
*/
/**
* @brief The GIF blit buffer size.
* @details Defaults to 32
* @note Bigger is faster but requires more RAM.
*/
#ifndef GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE
#define GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE 32
#endif
/** /**
* @} * @}
* *