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

trunk/src/media/filters/h264_parser.cc

 // 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.
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 
 #include "media/filters/h264_parser.h"
 
@@ skipping 88 matching lines @@
   } while (0)
 
 #define TRUE_OR_RETURN(a)                                            \
   do {                                                               \
     if (!(a)) {                                                      \
       DVLOG(1) << "Error in stream: invalid value, expected " << #a; \
       return kInvalidStream;                                         \
     }                                                                \
   } while (0)
 
+enum AspectRatioIdc {
+  kExtendedSar = 255,
+};
+
 // ISO 14496 part 10
 // VUI parameters: Table E-1 "Meaning of sample aspect ratio indicator"
 static const int kTableSarWidth[] = {
   0, 1, 12, 10, 16, 40, 24, 20, 32, 80, 18, 15, 64, 160, 4, 3, 2
 };
 static const int kTableSarHeight[] = {
   0, 1, 11, 11, 11, 33, 11, 11, 11, 33, 11, 11, 33, 99, 3, 2, 1
 };
 COMPILE_ASSERT(arraysize(kTableSarWidth) == arraysize(kTableSarHeight),
                sar_tables_must_have_same_size);
@@ skipping 478 matching lines @@
 
   return kOk;
 }
 
 H264Parser::Result H264Parser::ParseVUIParameters(H264SPS* sps) {
   bool aspect_ratio_info_present_flag;
   READ_BOOL_OR_RETURN(&aspect_ratio_info_present_flag);
   if (aspect_ratio_info_present_flag) {
     int aspect_ratio_idc;
     READ_BITS_OR_RETURN(8, &aspect_ratio_idc);
-    if (aspect_ratio_idc == H264SPS::kExtendedSar) {
+    if (aspect_ratio_idc == kExtendedSar) {
       READ_BITS_OR_RETURN(16, &sps->sar_width);
       READ_BITS_OR_RETURN(16, &sps->sar_height);
     } else {
       const int max_aspect_ratio_idc = arraysize(kTableSarWidth) - 1;
       IN_RANGE_OR_RETURN(aspect_ratio_idc, 0, max_aspect_ratio_idc);
       sps->sar_width = kTableSarWidth[aspect_ratio_idc];
       sps->sar_height = kTableSarHeight[aspect_ratio_idc];
     }
   }
 
@@ skipping 633 matching lines @@
 
     default:
       DVLOG(4) << "Unsupported SEI message";
       break;
   }
 
   return kOk;
 }
 
 }  // namespace media