dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-02-12 23:12:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

use a function pointer for ProcessRows()

Browse Source 
this allows later customization of data output method.
No perf diff observed, even if ProcessRows is no longer inlined.

Change-Id: I6933a3612a9cf6c108cf2776dfde0ae80c6c07c0
This commit is contained in:
Pascal Massimino 2012-05-23 02:00:14 -07:00
parent f7ae5e370a
commit 98ec717f1e
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/dec/vp8l.c
View File

@ -492,9 +492,14 @@ static WEBP_INLINE HTreeGroup* GetHtreeGroupForPos(VP8LMetadata* const hdr,
return hdr->htree_groups_ + meta_index; return hdr->htree_groups_ + meta_index;
} }
//------------------------------------------------------------------------------
// Main loop, with custom row-processing function
typedef void (*ProcessRowsFunc)(VP8LDecoder* const dec, int row);
// Processes (transforms, scales & color-converts) the rows decoded after the // Processes (transforms, scales & color-converts) the rows decoded after the
// last call. // last call.
static WEBP_INLINE void ProcessRows(VP8LDecoder* const dec, int row) { static void ProcessRows(VP8LDecoder* const dec, int row) {
int n = dec->next_transform_; int n = dec->next_transform_;
VP8Io* const io = dec->io_; VP8Io* const io = dec->io_;
WebPDecParams* const params = (WebPDecParams*)io->opaque; WebPDecParams* const params = (WebPDecParams*)io->opaque;
@ -542,7 +547,7 @@ static WEBP_INLINE void ProcessRows(VP8LDecoder* const dec, int row) {
static int DecodeImageData(VP8LDecoder* const dec, static int DecodeImageData(VP8LDecoder* const dec,
uint32_t* const data, int width, int height, uint32_t* const data, int width, int height,
int process_row) { ProcessRowsFunc process_func) {
int ok = 1; int ok = 1;
int col = 0, row = 0; int col = 0, row = 0;
VP8LBitReader* const br = &dec->br_; VP8LBitReader* const br = &dec->br_;
@ -582,8 +587,8 @@ static int DecodeImageData(VP8LDecoder* const dec,
if (col >= width) { if (col >= width) {
col = 0; col = 0;
++row; ++row;
if (process_row && (row % NUM_ARGB_CACHE_ROWS == 0)) { if ((process_func != NULL) && (row % NUM_ARGB_CACHE_ROWS == 0)) {
ProcessRows(dec, row); process_func(dec, row);
} }
if (color_cache != NULL) { if (color_cache != NULL) {
while (last_cached < src) { while (last_cached < src) {
@ -612,8 +617,8 @@ static int DecodeImageData(VP8LDecoder* const dec,
while (col >= width) { while (col >= width) {
col -= width; col -= width;
++row; ++row;
if (process_row && (row % NUM_ARGB_CACHE_ROWS == 0)) { if ((process_func != NULL) && (row % NUM_ARGB_CACHE_ROWS == 0)) {
ProcessRows(dec, row); process_func(dec, row);
} }
} }
if (src < src_end) { if (src < src_end) {
@ -640,7 +645,7 @@ static int DecodeImageData(VP8LDecoder* const dec,
if (!ok) goto End; if (!ok) goto End;
} }
// Process the remaining rows corresponding to last row-block. // Process the remaining rows corresponding to last row-block.
if (process_row) ProcessRows(dec, row); if (process_func != NULL) process_func(dec, row);
End: End:
if (br->error_ || !ok || (br->eos_ && src < src_end)) { if (br->error_ || !ok || (br->eos_ && src < src_end)) {
@ -875,7 +880,7 @@ static int DecodeImageStream(int xsize, int ysize,
} }
// Use the Huffman trees to decode the LZ77 encoded data. // Use the Huffman trees to decode the LZ77 encoded data.
ok = DecodeImageData(dec, data, transform_xsize, transform_ysize, 0); ok = DecodeImageData(dec, data, transform_xsize, transform_ysize, NULL);
ok = ok && !br->error_; ok = ok && !br->error_;
// Apply transforms on the decoded data. // Apply transforms on the decoded data.
@ -990,7 +995,8 @@ int VP8LDecodeImage(VP8LDecoder* const dec) {
// Decode. // Decode.
dec->action_ = READ_DATA; dec->action_ = READ_DATA;
if (!DecodeImageData(dec, dec->argb_, dec->width_, dec->height_, 1)) { if (!DecodeImageData(dec, dec->argb_, dec->width_, dec->height_,
ProcessRows)) {
goto Err; goto Err;
} }