Revert 279958 "Revert "Revert 279650 "Add VaapiVideoEncodeAccele..."

trunk/src/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 45 matching lines @@
 };
 
 enum {
   kH264ScalingList4x4Length = 16,
   kH264ScalingList8x8Length = 64,
 };
 
 struct MEDIA_EXPORT H264SPS {
   H264SPS();
 
-  enum H264ProfileIDC {
-    kProfileIDCBaseline = 66,
-    kProfileIDCConstrainedBaseline = kProfileIDCBaseline,
-    kProfileIDCMain = 77,
-    kProfileIDCHigh = 100,
-  };
-
-  enum AspectRatioIdc {
-    kExtendedSar = 255,
-  };
-
-  enum {
-    // Constants for HRD parameters (spec ch. E.2.2).
-    kBitRateScaleConstantTerm = 6,  // Equation E-37.
-    kCPBSizeScaleConstantTerm = 4,  // Equation E-38.
-    kDefaultInitialCPBRemovalDelayLength = 24,
-    kDefaultDPBOutputDelayLength = 24,
-    kDefaultTimeOffsetLength = 24,
-  };
-
   int profile_idc;
   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;
 
@@ skipping 28 matching lines @@
   int frame_crop_right_offset;
   int frame_crop_top_offset;
   int frame_crop_bottom_offset;
 
   bool vui_parameters_present_flag;
   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;
-  bool timing_info_present_flag;
-  int num_units_in_tick;
-  int time_scale;
-  bool fixed_frame_rate_flag;
-
-  // TODO(posciak): actually parse these instead of ParseAndIgnoreHRDParameters.
-  bool nal_hrd_parameters_present_flag;
-  int cpb_cnt_minus1;
-  int bit_rate_scale;
-  int cpb_size_scale;
-  int bit_rate_value_minus1[32];
-  int cpb_size_value_minus1[32];
-  bool cbr_flag[32];
-  int initial_cpb_removal_delay_length_minus_1;
-  int cpb_removal_delay_length_minus1;
-  int dpb_output_delay_length_minus1;
-  int time_offset_length;
-
-  bool low_delay_hrd_flag;
 
   int chroma_array_type;
 };
 
 struct MEDIA_EXPORT H264PPS {
   H264PPS();
 
   int pic_parameter_set_id;
   int seq_parameter_set_id;
   bool entropy_coding_mode_flag;
@@ skipping 277 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_