Index: media/base/video_decoder_config.h |
diff --git a/media/base/video_decoder_config.h b/media/base/video_decoder_config.h |
index 44182df4fbd74105ef8a2dd1390d50aabfa7d0d9..00a19eb50cf357cae2bfc0c17e2b7501e369d8cd 100644 |
--- a/media/base/video_decoder_config.h |
+++ b/media/base/video_decoder_config.h |
@@ -42,6 +42,7 @@ class MEDIA_EXPORT VideoDecoderConfig { |
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); |
~VideoDecoderConfig(); |
@@ -52,6 +53,7 @@ class MEDIA_EXPORT VideoDecoderConfig { |
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); |
// Returns true if this object has appropriate configuration values, false |
@@ -70,11 +72,25 @@ class MEDIA_EXPORT VideoDecoderConfig { |
// Region of |coded_size_| that is visible. |
gfx::Rect visible_rect() const; |
+ // Final visible width and height of a video frame with aspect ratio taken |
+ // into account. |
+ gfx::Size natural_size() const; |
+ |
// Frame rate in seconds expressed as a fraction. |
- // TODO(scherkus): fairly certain decoders don't require frame rates. |
+ // |
+ // This information is required to properly timestamp video frames for |
+ // codecs that contain repeated frames, such as found in H.264's |
+ // supplemental enhancement information. |
int frame_rate_numerator() const; |
int frame_rate_denominator() const; |
+ // Aspect ratio of the decoded video frame expressed as a fraction. |
+ // |
+ // TODO(scherkus): think of a better way to avoid having video decoders |
+ // handle tricky aspect ratio dimension calculations. |
+ int aspect_ratio_numerator() const; |
+ int aspect_ratio_denominator() const; |
+ |
// Optional byte data required to initialize video decoders, such as H.264 |
// AAVC data. |
uint8* extra_data() const; |
@@ -87,10 +103,14 @@ class MEDIA_EXPORT VideoDecoderConfig { |
gfx::Size coded_size_; |
gfx::Rect visible_rect_; |
+ gfx::Size natural_size_; |
int frame_rate_numerator_; |
int frame_rate_denominator_; |
+ int aspect_ratio_numerator_; |
+ int aspect_ratio_denominator_; |
+ |
scoped_array<uint8> extra_data_; |
size_t extra_data_size_; |