commit 4cbf05c56844afa5997a425c0d8fb257dbdaea04
author Rupert Swarbrick <rupert.swarbrick@argondesign.com> Tue Nov 07 15:26:15 2017 +0000
committer Debargha Mukherjee <debargha@google.com> Tue Nov 07 21:34:28 2017 +0000
tree f5e87ca4bd246f40f8ae5e30560bf6ffad0ea737
parent 4596deb2483ca3eefc81ffa4faf2c60ed3caddec

Fix widths in OBU reading code

It was mixing uint32_t and size_t, which isn't correct on a 64-bit
system and causes compilation warnings.

Change-Id: I3677c02cb366d60175e762ec4249d2445ee729de

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 165164d..adc6c37 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -3802,7 +3802,7 @@
 #if CONFIG_OBU
 
 static OBU_TYPE read_obu_header(struct aom_read_bit_buffer *rb,
-                                uint32_t *header_size) {
+                                size_t *header_size) {
   OBU_TYPE obu_type;
   int obu_extension_flag;
 
@@ -3907,10 +3907,8 @@
   return header_size + tg_payload_size;
 }
 
-static void read_metadata_private_data(const uint8_t *data, uint32_t sz) {
-  int i;
-
-  for (i = 0; i < (int)sz; i++) {
+static void read_metadata_private_data(const uint8_t *data, size_t sz) {
+  for (size_t i = 0; i < sz; i++) {
     mem_get_le16(data);
     data += 2;
   }
@@ -3940,9 +3938,10 @@
   mem_get_le16(data);
 }
 
-static uint32_t read_metadata(const uint8_t *data, uint32_t sz) {
+static size_t read_metadata(const uint8_t *data, size_t sz) {
   METADATA_TYPE metadata_type;
 
+  assert(sz >= 2);
   metadata_type = (METADATA_TYPE)mem_get_le16(data);
 
   if (metadata_type == METADATA_TYPE_PRIVATE_DATA) {
@@ -3969,7 +3968,7 @@
   while (!frame_decoding_finished && !cm->error.error_code) {
     struct aom_read_bit_buffer rb;
     uint8_t clear_data[80];
-    uint32_t obu_size, obu_header_size, obu_payload_size = 0;
+    size_t obu_size, obu_header_size, obu_payload_size = 0;
     OBU_TYPE obu_type;
 
     init_read_bit_buffer(pbi, &rb, data + PRE_OBU_SIZE_BYTES, data_end,