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..d055f49d47b3d46178ff2e25cc2bc7d361216418 100644 |
--- a/media/base/video_decoder_config.cc |
+++ b/media/base/video_decoder_config.cc |
@@ -4,6 +4,8 @@ |
#include "media/base/video_decoder_config.h" |
+#include <cmath> |
+ |
#include "base/logging.h" |
namespace media { |
@@ -13,6 +15,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 +26,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 +44,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 +56,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) { |
@@ -55,13 +66,31 @@ void VideoDecoderConfig::Initialize(VideoCodec codec, |
} else { |
extra_data_.reset(); |
} |
+ |
+ // Calculate the natural size given the aspect ratio and visible rect. |
+ if (aspect_ratio_denominator == 0) { |
+ natural_size_.SetSize(0, 0); |
+ return; |
+ } |
+ |
+ double aspect_ratio = aspect_ratio_numerator / |
+ static_cast<double>(aspect_ratio_denominator); |
+ |
+ int width = floor(visible_rect.width() * aspect_ratio + 0.5); |
+ int height = visible_rect.height(); |
+ |
+ // An even width makes things easier for YV12 and appears to be the behavior |
+ // expected by WebKit layout tests. |
+ natural_size_.SetSize(width & ~1, height); |
} |
bool VideoDecoderConfig::IsValidConfig() const { |
return codec_ != kUnknownVideoCodec && |
format_ != VideoFrame::INVALID && |
frame_rate_numerator_ > 0 && |
- frame_rate_denominator_ > 0; |
+ frame_rate_denominator_ > 0 && |
+ aspect_ratio_numerator_ > 0 && |
+ aspect_ratio_denominator_ > 0; |
} |
VideoCodec VideoDecoderConfig::codec() const { |
@@ -80,6 +109,10 @@ gfx::Rect VideoDecoderConfig::visible_rect() const { |
return visible_rect_; |
} |
+gfx::Size VideoDecoderConfig::natural_size() const { |
+ return natural_size_; |
+} |
+ |
int VideoDecoderConfig::frame_rate_numerator() const { |
return frame_rate_numerator_; |
} |
@@ -88,6 +121,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(); |
} |