VAVDA: Switch to using max_num_reorder_frames.

media/filters/h264_parser.h

Index: media/filters/h264_parser.h
diff --git a/media/filters/h264_parser.h b/media/filters/h264_parser.h
index 2f214c7f6ebab0c4428738d6d6d36443eca1c303..5dc8f51cfd03ff786f9a549711b106030db1e170 100644
--- a/media/filters/h264_parser.h
+++ b/media/filters/h264_parser.h
@@ -53,7 +53,12 @@ struct MEDIA_EXPORT H264SPS {
   H264SPS();
 
   int profile_idc;
-  int constraint_setx_flag;
+  bool constraint_set0_flag;
+  bool constraint_set1_flag;
+  bool constraint_set2_flag;
+  bool constraint_set3_flag;
+  bool constraint_set4_flag;
+  bool constraint_set5_flag;
   int level_idc;
   int seq_parameter_set_id;
 
@@ -88,10 +93,15 @@ struct MEDIA_EXPORT H264SPS {
   int frame_crop_right_offset;
   int frame_crop_top_offset;
   int frame_crop_bottom_offset;
+
   bool vui_parameters_present_flag;
-  int chroma_array_type;
   int sar_width;    // Set to 0 when not specified.
   int sar_height;   // Set to 0 when not specified.
+  bool bitstream_restriction_flag;
+  int max_num_reorder_frames;
+  int max_dec_frame_buffering;
+
+  int chroma_array_type;
 };
 
 struct MEDIA_EXPORT H264PPS {
@@ -344,6 +354,11 @@ class MEDIA_EXPORT H264Parser {
   Result ParseSPSScalingLists(H264SPS* sps);
   Result ParsePPSScalingLists(const H264SPS& sps, H264PPS* pps);
 
+  // Parse optional VUI parameters in SPS (see spec).
+  Result ParseVUIParameters(H264SPS* sps);
+  // Set |hrd_parameters_present| to true only if they are present.
+  Result ParseAndIgnoreHRDParameters(bool* hrd_parameters_present);
+
   // Parse reference picture lists' modifications (see spec).
   Result ParseRefPicListModifications(H264SliceHeader* shdr);
   Result ParseRefPicListModification(int num_ref_idx_active_minus1,