commit e4c6fc18a7930a27b7927f28ee79f7372278fb8f
author Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Wed Jun 21 16:43:22 2017 +0200
committer Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Fri Jul 07 07:20:09 2017 +0000
tree 232ab8f0834edb7d2c603021f243b67c7ebb8f4c
parent 627e2fd52ff024385f208f9ad59b1311aacc5ee1

Encode superframes in front

This moves the superframe index at the beginning of the frame packet.
There's no change in the superframe index format, and it's still
optional.

BUG=aomedia:22

Change-Id: I1488429bd114c220ed110be34baee19191ff730e

av1/decoder/decoder.c

diff --git a/av1/decoder/decoder.c b/av1/decoder/decoder.c
index d818c4d..4a68deb 100644
--- a/av1/decoder/decoder.c
+++ b/av1/decoder/decoder.c
@@ -520,6 +520,7 @@
 
 aom_codec_err_t av1_parse_superframe_index(const uint8_t *data, size_t data_sz,
                                            uint32_t sizes[8], int *count,
+                                           int *index_size,
                                            aom_decrypt_cb decrypt_cb,
                                            void *decrypt_state) {
   // A chunk ending with a byte matching 0xc0 is an invalid chunk unless
@@ -532,13 +533,14 @@
   size_t frame_sz_sum = 0;
 
   assert(data_sz);
-  marker = read_marker(decrypt_cb, decrypt_state, data + data_sz - 1);
+  marker = read_marker(decrypt_cb, decrypt_state, data);
   *count = 0;
 
   if ((marker & 0xe0) == 0xc0) {
     const uint32_t frames = (marker & 0x7) + 1;
     const uint32_t mag = ((marker >> 3) & 0x3) + 1;
     const size_t index_sz = 2 + mag * (frames - 1);
+    *index_size = (int)index_sz;
 
     // This chunk is marked as having a superframe index but doesn't have
     // enough data for it, thus it's an invalid superframe index.
@@ -546,7 +548,7 @@
 
     {
       const uint8_t marker2 =
-          read_marker(decrypt_cb, decrypt_state, data + data_sz - index_sz);
+          read_marker(decrypt_cb, decrypt_state, data + index_sz - 1);
 
       // This chunk is marked as having a superframe index but doesn't have
       // the matching marker byte at the front of the index therefore it's an
@@ -557,7 +559,7 @@
     {
       // Found a valid superframe index.
       uint32_t i, j;
-      const uint8_t *x = &data[data_sz - index_sz + 1];
+      const uint8_t *x = &data[1];
 
       // Frames has a maximum of 8 and mag has a maximum of 4.
       uint8_t clear_buffer[28];