diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2014-06-20 16:28:07 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-06-20 16:28:07 -0700 |
| commit | e8dcadc22ac11af4d73f3edb0b0a328f22af6749 (patch) | |
| tree | ed50d50f36c4d73a460562cad8c8d20b0792beab /vp9 | |
| parent | 94e115502c3e878a09c8639ceba59d1e5d873be1 (diff) | |
| parent | 815485a2a8c130b80758d9c6e5ffc8c3e67e5e7d (diff) | |
| download | libvpx-e8dcadc22ac11af4d73f3edb0b0a328f22af6749.tar libvpx-e8dcadc22ac11af4d73f3edb0b0a328f22af6749.tar.gz libvpx-e8dcadc22ac11af4d73f3edb0b0a328f22af6749.tar.bz2 libvpx-e8dcadc22ac11af4d73f3edb0b0a328f22af6749.zip | |
Merge "fix peek_si to enable 1 byte show existing frames."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/vp9_dx_iface.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c index 7464e7969..39807a1d6 100644 --- a/vp9/vp9_dx_iface.c +++ b/vp9/vp9_dx_iface.c @@ -112,9 +112,6 @@ static vpx_codec_err_t decoder_peek_si_internal(const uint8_t *data, void *decrypt_state) { uint8_t clear_buffer[9]; - if (data_sz <= 8) - return VPX_CODEC_UNSUP_BITSTREAM; - if (data + data_sz <= data) 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) return VPX_CODEC_UNSUP_BITSTREAM; + if (version > 1) return VPX_CODEC_UNSUP_BITSTREAM; if (vp9_rb_read_bit(&rb)) { // show an existing frame return VPX_CODEC_OK; } + if (data_sz <= 8) + return VPX_CODEC_UNSUP_BITSTREAM; + si->is_kf = !vp9_rb_read_bit(&rb); if (si->is_kf) { const int sRGB = 7; |