[aom] Fix stream info peeking

Backport upstream patch by Sebastian Alaiwan fixing
aom_peek_stream_info after changes to the superblock
location.

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 c95a8f24e1..df2c81dc90 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;