generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "fix peek_si to enable 1 byte show existing frames."

Browse Source
This commit is contained in:
Jim Bankoski
2014-06-20 16:28:07 -07:00
committed by Gerrit Code Review
parent 94e115502c 815485a2a8
commit e8dcadc22a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vp9/vp9_dx_iface.c
View File

@@ -112,9 +112,6 @@ static vpx_codec_err_t decoder_peek_si_internal(const uint8_t *data,
void *decrypt_state) { void *decrypt_state) {
uint8_t clear_buffer[9]; uint8_t clear_buffer[9];
if (data_sz <= 8)
return VPX_CODEC_UNSUP_BITSTREAM;
if (data + data_sz <= data) if (data + data_sz <= data)
return VPX_CODEC_INVALID_PARAM; return VPX_CODEC_INVALID_PARAM;
@@ -135,12 +132,16 @@ static vpx_codec_err_t decoder_peek_si_internal(const uint8_t *data,
if (frame_marker != VP9_FRAME_MARKER) if (frame_marker != VP9_FRAME_MARKER)
return VPX_CODEC_UNSUP_BITSTREAM; return VPX_CODEC_UNSUP_BITSTREAM;
if (version > 1) return VPX_CODEC_UNSUP_BITSTREAM; if (version > 1) return VPX_CODEC_UNSUP_BITSTREAM;
if (vp9_rb_read_bit(&rb)) { // show an existing frame if (vp9_rb_read_bit(&rb)) { // show an existing frame
return VPX_CODEC_OK; return VPX_CODEC_OK;
} }
if (data_sz <= 8)
return VPX_CODEC_UNSUP_BITSTREAM;
si->is_kf = !vp9_rb_read_bit(&rb); si->is_kf = !vp9_rb_read_bit(&rb);
if (si->is_kf) { if (si->is_kf) {
const int sRGB = 7; const int sRGB = 7;