devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Flag EOF and empty buffer conditions as UNLIKELY in JPEG decoder.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20907 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andrew Mahone 2009-05-11 00:16:57 +00:00
parent b5c356be85
commit c8b67c3ca0
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
apps/recorder/jpeg_load.c
View file

@ -833,7 +833,7 @@ struct idct_entry idct_tbl[] = {
#ifdef JPEG_FROM_MEM #ifdef JPEG_FROM_MEM
INLINE unsigned char *getc(struct jpeg* p_jpeg) INLINE unsigned char *getc(struct jpeg* p_jpeg)
{ {
if (p_jpeg->len) if (LIKELY(p_jpeg->len))
{ {
p_jpeg->len--; p_jpeg->len--;
return p_jpeg->data++; return p_jpeg->data++;
@ -869,9 +869,9 @@ INLINE void fill_buf(struct jpeg* p_jpeg)
static unsigned char *getc(struct jpeg* p_jpeg) static unsigned char *getc(struct jpeg* p_jpeg)
{ {
if (p_jpeg->buf_left < 1) if (UNLIKELY(p_jpeg->buf_left < 1))
fill_buf(p_jpeg); fill_buf(p_jpeg);
if (p_jpeg->buf_left < 1) if (UNLIKELY(p_jpeg->buf_left < 1))
return NULL; return NULL;
p_jpeg->buf_left--; p_jpeg->buf_left--;
return (p_jpeg->buf_index++) + p_jpeg->buf; return (p_jpeg->buf_index++) + p_jpeg->buf;
@ -879,7 +879,7 @@ static unsigned char *getc(struct jpeg* p_jpeg)
INLINE bool skip_bytes_seek(struct jpeg* p_jpeg) INLINE bool skip_bytes_seek(struct jpeg* p_jpeg)
{ {
if (lseek(p_jpeg->fd, -p_jpeg->buf_left, SEEK_CUR) < 0) if (UNLIKELY(lseek(p_jpeg->fd, -p_jpeg->buf_left, SEEK_CUR) < 0))
return false; return false;
p_jpeg->buf_left = 0; p_jpeg->buf_left = 0;
return true; return true;
@ -901,14 +901,14 @@ static void putc(struct jpeg* p_jpeg)
#define e_skip_bytes(jpeg, count) \ #define e_skip_bytes(jpeg, count) \
do {\ do {\
if (!skip_bytes((jpeg),(count))) \ if (UNLIKELY(!skip_bytes((jpeg),(count)))) \
return -1; \ return -1; \
} while (0) } while (0)
#define e_getc(jpeg, code) \ #define e_getc(jpeg, code) \
({ \ ({ \
unsigned char *c; \ unsigned char *c; \
if (!(c = getc(jpeg))) \ if (UNLIKELY(!(c = getc(jpeg)))) \
return (code); \ return (code); \
*c; \ *c; \
}) })
@ -916,7 +916,7 @@ do {\
#define d_getc(jpeg, def) \ #define d_getc(jpeg, def) \
({ \ ({ \
unsigned char *cp = getc(jpeg); \ unsigned char *cp = getc(jpeg); \
unsigned char c = cp ? *cp : (def); \ unsigned char c = LIKELY(cp) ? *cp : (def); \
c; \ c; \
}) })
@ -1547,7 +1547,7 @@ static void fill_bit_buffer(struct jpeg* p_jpeg)
if (p_jpeg->marker_val) if (p_jpeg->marker_val)
p_jpeg->marker_ind += 16; p_jpeg->marker_ind += 16;
byte = d_getc(p_jpeg, 0); byte = d_getc(p_jpeg, 0);
if (byte == 0xFF) /* legal marker can be byte stuffing or RSTm */ if (UNLIKELY(byte == 0xFF)) /* legal marker can be byte stuffing or RSTm */
{ /* simplification: just skip the (one-byte) marker code */ { /* simplification: just skip the (one-byte) marker code */
marker = d_getc(p_jpeg, 0); marker = d_getc(p_jpeg, 0);
if ((marker & ~7) == 0xD0) if ((marker & ~7) == 0xD0)
@ -1559,7 +1559,7 @@ static void fill_bit_buffer(struct jpeg* p_jpeg)
p_jpeg->bitbuf = (p_jpeg->bitbuf << 8) | byte; p_jpeg->bitbuf = (p_jpeg->bitbuf << 8) | byte;
byte = d_getc(p_jpeg, 0); byte = d_getc(p_jpeg, 0);
if (byte == 0xFF) /* legal marker can be byte stuffing or RSTm */ if (UNLIKELY(byte == 0xFF)) /* legal marker can be byte stuffing or RSTm */
{ /* simplification: just skip the (one-byte) marker code */ { /* simplification: just skip the (one-byte) marker code */
marker = d_getc(p_jpeg, 0); marker = d_getc(p_jpeg, 0);
if ((marker & ~7) == 0xD0) if ((marker & ~7) == 0xD0)