ref: e8dcadc22ac11af4d73f3edb0b0a328f22af6749
parent: 94e115502c3e878a09c8639ceba59d1e5d873be1
parent: 815485a2a8c130b80758d9c6e5ffc8c3e67e5e7d
author: Jim Bankoski <[email protected]>
date: Fri Jun 20 12:28:07 EDT 2014
Merge "fix peek_si to enable 1 byte show existing frames."
--- a/vp9/vp9_dx_iface.c
+++ b/vp9/vp9_dx_iface.c
@@ -112,9 +112,6 @@
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,11 +132,15 @@
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) {