VAVDA: Switch to using max_num_reorder_frames.

media/filters/h264_parser.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This file contains an implementation of an H264 Annex-B video stream parser.
 
 #ifndef MEDIA_FILTERS_H264_PARSER_H_
 #define MEDIA_FILTERS_H264_PARSER_H_
 
 #include <sys/types.h>
@@ skipping 35 matching lines @@
 
 enum {
   kH264ScalingList4x4Length = 16,
   kH264ScalingList8x8Length = 64,
 };
 
 struct MEDIA_EXPORT H264SPS {
   H264SPS();
 
   int profile_idc;
-  int constraint_setx_flag;
+  bool constraint_setx_flag[6];

[Ami GONE FROM CHROMIUM, 2014/02/25 09:45:37]

This is C++ so bool is int8_t so bool[] is a pretty good way of confusing
readers, IMO.
Why the change?

[Pawel Osciak, 2014/02/26 06:02:15]

So this was actually used to store all six flags (6 bits) before. Now we keep
each of them separately and treat them as all the other *_flag variables in this
struct, i.e. actual bools.

For me this way is definitely less confusing. Why would this be more confusing?

[Ami GONE FROM CHROMIUM, 2014/02/26 17:15:58]

In the spec the bits are packed.  Using a bool[] _looks_ like a packet array of
bits, but in fact is a uint8[] where each uint8 carries one bit of information
and 7 bits of empty space.

I'd say either the old approach (single int to hold 6 bits) or 6 separate bool
fields (like what the spec does) would be fine, but a bool[] is pretty much the
worst choice.

   int level_idc;
   int seq_parameter_set_id;
 
   int chroma_format_idc;
   bool separate_colour_plane_flag;
   int bit_depth_luma_minus8;
   int bit_depth_chroma_minus8;
   bool qpprime_y_zero_transform_bypass_flag;
 
   bool seq_scaling_matrix_present_flag;
@@ skipping 14 matching lines @@
   int pic_width_in_mbs_minus1;
   int pic_height_in_map_units_minus1;
   bool frame_mbs_only_flag;
   bool mb_adaptive_frame_field_flag;
   bool direct_8x8_inference_flag;
   bool frame_cropping_flag;
   int frame_crop_left_offset;
   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 {
   H264PPS();
 
   int pic_parameter_set_id;
   int seq_parameter_set_id;
   bool entropy_coding_mode_flag;
   bool bottom_field_pic_order_in_frame_present_flag;
   int num_slice_groups_minus1;
@@ skipping 232 matching lines @@
   Result ReadUE(int* val);
 
   // Read one signed exp-Golomb code from the stream and return in |*val|.
   Result ReadSE(int* val);
 
   // Parse scaling lists (see spec).
   Result ParseScalingList(int size, int* scaling_list, bool* use_default);
   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,
                                      H264ModificationOfPicNum* ref_list_mods);
 
   // Parse prediction weight table (see spec).
   Result ParsePredWeightTable(const H264SPS& sps, H264SliceHeader* shdr);
 
   // Parse weighting factors (see spec).
   Result ParseWeightingFactors(int num_ref_idx_active_minus1,
@@ skipping 18 matching lines @@
   typedef std::map<int, H264PPS*> PPSById;
   SPSById active_SPSes_;
   PPSById active_PPSes_;
 
   DISALLOW_COPY_AND_ASSIGN(H264Parser);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_H264_PARSER_H_