Index: media/base/video_decoder_config.cc |
diff --git a/media/base/video_decoder_config.cc b/media/base/video_decoder_config.cc |
index 81583c1bb113f24a352564dae20fd9daefc7caa0..976037fa48e0043a5130575e64963f0612256630 100644 |
--- a/media/base/video_decoder_config.cc |
+++ b/media/base/video_decoder_config.cc |
@@ -13,6 +13,8 @@ VideoDecoderConfig::VideoDecoderConfig() |
format_(VideoFrame::INVALID), |
frame_rate_numerator_(0), |
frame_rate_denominator_(0), |
+ aspect_ratio_numerator_(0), |
+ aspect_ratio_denominator_(0), |
extra_data_size_(0) { |
} |
@@ -22,10 +24,13 @@ VideoDecoderConfig::VideoDecoderConfig(VideoCodec codec, |
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); |
} |
@@ -37,6 +42,8 @@ void VideoDecoderConfig::Initialize(VideoCodec codec, |
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)); |
@@ -47,6 +54,8 @@ void VideoDecoderConfig::Initialize(VideoCodec codec, |
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) { |
@@ -88,6 +97,14 @@ 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(); |
} |