Remove DemuxerStream::GetAVStream() once and for all.

media/base/video_decoder_config.cc

 // Copyright (c) 2011 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 "media/base/video_decoder_config.h"
 
 #include "base/logging.h"
 
 namespace media {
 
 VideoDecoderConfig::VideoDecoderConfig()
     : codec_(kUnknownVideoCodec),
       format_(VideoFrame::INVALID),
       frame_rate_numerator_(0),
       frame_rate_denominator_(0),
+      aspect_ratio_numerator_(0),
+      aspect_ratio_denominator_(0),
       extra_data_size_(0) {
 }
 
 VideoDecoderConfig::VideoDecoderConfig(VideoCodec codec,
                                        VideoFrame::Format format,
                                        const gfx::Size& coded_size,
                                        const gfx::Rect& visible_rect,
                                        int frame_rate_numerator,
                                        int frame_rate_denominator,
+                                       int aspect_ratio_numerator,
+                                       int aspect_ratio_denominator,
                                        const uint8* extra_data,
                                        size_t extra_data_size) {
   Initialize(codec, format, coded_size, visible_rect,
              frame_rate_numerator, frame_rate_denominator,
+             aspect_ratio_numerator, aspect_ratio_denominator,
              extra_data, extra_data_size);
 }
 
 VideoDecoderConfig::~VideoDecoderConfig() {}
 
 void VideoDecoderConfig::Initialize(VideoCodec codec,
                                     VideoFrame::Format format,
                                     const gfx::Size& coded_size,
                                     const gfx::Rect& visible_rect,
                                     int frame_rate_numerator,
                                     int frame_rate_denominator,
+                                    int aspect_ratio_numerator,
+                                    int aspect_ratio_denominator,
                                     const uint8* extra_data,
                                     size_t extra_data_size) {
   CHECK((extra_data_size != 0) == (extra_data != NULL));
 
   codec_ = codec;
   format_ = format;
   coded_size_ = coded_size;
   visible_rect_ = visible_rect;
   frame_rate_numerator_ = frame_rate_numerator;
   frame_rate_denominator_ = frame_rate_denominator;
+  aspect_ratio_numerator_ = aspect_ratio_numerator;
+  aspect_ratio_denominator_ = aspect_ratio_denominator;
   extra_data_size_ = extra_data_size;
 
   if (extra_data_size_ > 0) {
     extra_data_.reset(new uint8[extra_data_size_]);
     memcpy(extra_data_.get(), extra_data, extra_data_size_);
   } else {
     extra_data_.reset();
   }
 }
 
@@ skipping 21 matching lines @@
 }
 
 int VideoDecoderConfig::frame_rate_numerator() const {
   return frame_rate_numerator_;
 }
 
 int VideoDecoderConfig::frame_rate_denominator() const {
   return frame_rate_denominator_;
 }
 
+int VideoDecoderConfig::aspect_ratio_numerator() const {
+  return aspect_ratio_numerator_;
+}
+
+int VideoDecoderConfig::aspect_ratio_denominator() const {
+  return aspect_ratio_denominator_;
+}
+
 uint8* VideoDecoderConfig::extra_data() const {
   return extra_data_.get();
 }
 
 size_t VideoDecoderConfig::extra_data_size() const {
   return extra_data_size_;
 }
 
 }  // namespace media