dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-04-05 00:16:50 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Never send VP8_STATUS_SUSPENDED back in non-incremental.

Browse Source 
Add the incremental_ member to the internal VP8Decoder,
to mimic VP8LDecoder

Change-Id: I34842e473bb566f51c18fe42afda63e66c0185b6
This commit is contained in:
Vincent Rabaud 2023-09-18 16:39:46 +02:00
parent dce8397fec
commit 35e197bdb7
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/dec/idec_dec.c
View File

@ -326,6 +326,7 @@ static VP8StatusCode DecodeWebPHeaders(WebPIDecoder* const idec) {
idec->is_lossless_ = headers.is_lossless; idec->is_lossless_ = headers.is_lossless;
if (!idec->is_lossless_) { if (!idec->is_lossless_) {
VP8Decoder* const dec = VP8New(); VP8Decoder* const dec = VP8New();
dec->incremental_ = 1;
if (dec == NULL) { if (dec == NULL) {
return VP8_STATUS_OUT_OF_MEMORY; return VP8_STATUS_OUT_OF_MEMORY;
} }

20
src/dec/vp8_dec.c
View File

@ -86,6 +86,8 @@ void VP8Delete(VP8Decoder* const dec) {
int VP8SetError(VP8Decoder* const dec, int VP8SetError(VP8Decoder* const dec,
VP8StatusCode error, const char* const msg) { VP8StatusCode error, const char* const msg) {
// VP8_STATUS_SUSPENDED is only meaningful in incremental decoding.
assert(dec->incremental_ || error != VP8_STATUS_SUSPENDED);
// The oldest error reported takes precedence over the new one. // The oldest error reported takes precedence over the new one.
if (dec->status_ == VP8_STATUS_OK) { if (dec->status_ == VP8_STATUS_OK) {
dec->status_ = error; dec->status_ = error;
@ -190,12 +192,12 @@ static int ParseSegmentHeader(VP8BitReader* br,
} }
// Paragraph 9.5 // Paragraph 9.5
// This function returns VP8_STATUS_SUSPENDED if we don't have all the // If we don't have all the necessary data in 'buf', this function returns
// necessary data in 'buf'. // VP8_STATUS_SUSPENDED in incremental decoding, VP8_STATUS_NOT_ENOUGH_DATA
// This case is not necessarily an error (for incremental decoding). // otherwise.
// Still, no bitreader is ever initialized to make it possible to read // In incremental decoding, this case is not necessarily an error. Still, no
// unavailable memory. // bitreader is ever initialized to make it possible to read unavailable memory.
// If we don't even have the partitions' sizes, than VP8_STATUS_NOT_ENOUGH_DATA // If we don't even have the partitions' sizes, then VP8_STATUS_NOT_ENOUGH_DATA
// is returned, and this is an unrecoverable error. // is returned, and this is an unrecoverable error.
// If the partitions were positioned ok, VP8_STATUS_OK is returned. // If the partitions were positioned ok, VP8_STATUS_OK is returned.
static VP8StatusCode ParsePartitions(VP8Decoder* const dec, static VP8StatusCode ParsePartitions(VP8Decoder* const dec,
@ -225,8 +227,10 @@ static VP8StatusCode ParsePartitions(VP8Decoder* const dec,
sz += 3; sz += 3;
} }
VP8InitBitReader(dec->parts_ + last_part, part_start, size_left); VP8InitBitReader(dec->parts_ + last_part, part_start, size_left);
return (part_start < buf_end) ? VP8_STATUS_OK : if (part_start < buf_end) return VP8_STATUS_OK;
VP8_STATUS_SUSPENDED; // Init is ok, but there's not enough data return dec->incremental_
? VP8_STATUS_SUSPENDED // Init is ok, but there's not enough data
: VP8_STATUS_NOT_ENOUGH_DATA;
} }
// Paragraph 9.4 // Paragraph 9.4

1
src/dec/vp8i_dec.h
View File

@ -186,6 +186,7 @@ struct VP8Decoder {
// Main data source // Main data source
VP8BitReader br_; VP8BitReader br_;
int incremental_; // if true, incremental decoding is expected
// headers // headers
VP8FrameHeader frm_hdr_; VP8FrameHeader frm_hdr_;