summaryrefslogtreecommitdiffstats
path: root/third_party/aom
diff options
context:
space:
mode:
authortrav90 <travawine@palemoon.org>2018-10-18 19:41:52 -0500
committertrav90 <travawine@palemoon.org>2018-10-18 19:41:52 -0500
commite394e204938c6ab8b8215727332ddf97438c89cf (patch)
treec92ef0024aea8d9daa72712c377d2b82065b0694 /third_party/aom
parent21598d1bdd2ad2a48c43160ed30f20247e6dd75f (diff)
downloadUXP-e394e204938c6ab8b8215727332ddf97438c89cf.tar
UXP-e394e204938c6ab8b8215727332ddf97438c89cf.tar.gz
UXP-e394e204938c6ab8b8215727332ddf97438c89cf.tar.lz
UXP-e394e204938c6ab8b8215727332ddf97438c89cf.tar.xz
UXP-e394e204938c6ab8b8215727332ddf97438c89cf.zip
[aom] Fix stream info peeking
Backport upstream patch by Sebastian Alaiwan fixing aom_peek_stream_info after changes to the superblock location.
Diffstat (limited to 'third_party/aom')
-rw-r--r--third_party/aom/av1/av1_dx_iface.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/third_party/aom/av1/av1_dx_iface.c b/third_party/aom/av1/av1_dx_iface.c
index c95a8f24e..df2c81dc9 100644
--- a/third_party/aom/av1/av1_dx_iface.c
+++ b/third_party/aom/av1/av1_dx_iface.c
@@ -218,6 +218,19 @@ static aom_codec_err_t decoder_peek_si_internal(
data = clear_buffer;
}
+ // skip a potential superframe index
+ {
+ uint32_t frame_sizes[8];
+ int frame_count;
+ int index_size = 0;
+ aom_codec_err_t res = av1_parse_superframe_index(
+ data, data_sz, frame_sizes, &frame_count, &index_size, NULL, NULL);
+ if (res != AOM_CODEC_OK) return res;
+
+ data += index_size;
+ data_sz -= index_size;
+ }
+
{
int show_frame;
int error_resilient;