Backed out changeset 9cc4ece5f9d5 (bug 1374774)

media/libstagefright/binding/H264.cpp

@@ -721,11 +721,11 @@ H264::vui_parameters(BitReader& aBr, SPSData& aDest)
     READUE(chroma_sample_loc_type_bottom_field, 5);
   }
 
-  bool timing_info_present_flag = aBr.ReadBit();
-  if (timing_info_present_flag) {
-    aBr.ReadBits(32); // num_units_in_tick
-    aBr.ReadBits(32); // time_scale
-    aBr.ReadBit(); // fixed_frame_rate_flag
+  aDest.timing_info_present_flag = aBr.ReadBit();
+  if (aDest.timing_info_present_flag) {
+    aDest.num_units_in_tick = aBr.ReadBits(32);
+    aDest.time_scale = aBr.ReadBits(32);
+    aDest.fixed_frame_rate_flag = aBr.ReadBit();
   }
   return true;
 }

media/libstagefright/binding/include/mp4_demuxer/H264.h

@@ -396,6 +396,10 @@ struct SPSData
   */
   uint8_t chroma_sample_loc_type_top_field;
   uint8_t chroma_sample_loc_type_bottom_field;
+  bool timing_info_present_flag;
+  uint32_t num_units_in_tick;
+  uint32_t time_scale;
+  bool fixed_frame_rate_flag;
 
   bool scaling_matrix_present;
   uint8_t scaling_matrix4x4[6][16];