Remove VideoDecoderConfig::aspect_ratio_xxx methods.

media/base/video_decoder_config.cc

Index: media/base/video_decoder_config.cc
diff --git a/media/base/video_decoder_config.cc b/media/base/video_decoder_config.cc
index 6fa1aec5f78f742e0bd772adc10169073a076c83..02d45fa8237addc90546cc3741f47b2b8f9ddf1c 100644
--- a/media/base/video_decoder_config.cc
+++ b/media/base/video_decoder_config.cc
@@ -4,8 +4,6 @@
 
 #include "media/base/video_decoder_config.h"
 
-#include <cmath>
-
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 
@@ -15,8 +13,6 @@ VideoDecoderConfig::VideoDecoderConfig()
     : codec_(kUnknownVideoCodec),
       profile_(VIDEO_CODEC_PROFILE_UNKNOWN),
       format_(VideoFrame::INVALID),
-      aspect_ratio_numerator_(0),
-      aspect_ratio_denominator_(0),
       extra_data_size_(0) {
 }
 
@@ -25,12 +21,10 @@ VideoDecoderConfig::VideoDecoderConfig(VideoCodec codec,
                                        VideoFrame::Format format,
                                        const gfx::Size& coded_size,
                                        const gfx::Rect& visible_rect,
-                                       int aspect_ratio_numerator,
-                                       int aspect_ratio_denominator,
                                        const uint8* extra_data,
                                        size_t extra_data_size) {
   Initialize(codec, profile, format, coded_size, visible_rect,
-             aspect_ratio_numerator, aspect_ratio_denominator,
+             gfx::Size(visible_rect.width(), visible_rect.height()),

[Ami GONE FROM CHROMIUM, 2012/08/01 17:45:23]

Simpler as visible_rect.size()

[acolwell GONE FROM CHROMIUM, 2012/08/01 20:52:40]

Not longer needed.

              extra_data, extra_data_size, true);
 }
 
@@ -63,8 +57,7 @@ void VideoDecoderConfig::Initialize(VideoCodec codec,
                                     VideoFrame::Format format,
                                     const gfx::Size& coded_size,
                                     const gfx::Rect& visible_rect,
-                                    int aspect_ratio_numerator,
-                                    int aspect_ratio_denominator,
+                                    const gfx::Size& natural_size,
                                     const uint8* extra_data,
                                     size_t extra_data_size,
                                     bool record_stats) {
@@ -88,8 +81,7 @@ void VideoDecoderConfig::Initialize(VideoCodec codec,
   format_ = format;
   coded_size_ = coded_size;
   visible_rect_ = visible_rect;
-  aspect_ratio_numerator_ = aspect_ratio_numerator;
-  aspect_ratio_denominator_ = aspect_ratio_denominator;
+  natural_size_ = natural_size;
   extra_data_size_ = extra_data_size;
 
   if (extra_data_size_ > 0) {
@@ -98,22 +90,6 @@ 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);
 }
 
 void VideoDecoderConfig::CopyFrom(const VideoDecoderConfig& video_config) {
@@ -122,8 +98,7 @@ void VideoDecoderConfig::CopyFrom(const VideoDecoderConfig& video_config) {
              video_config.format(),
              video_config.coded_size(),
              video_config.visible_rect(),
-             video_config.aspect_ratio_numerator(),
-             video_config.aspect_ratio_denominator(),
+             video_config.natural_size(),
              video_config.extra_data(),
              video_config.extra_data_size(),
              false);
@@ -131,8 +106,8 @@ void VideoDecoderConfig::CopyFrom(const VideoDecoderConfig& video_config) {
 
 bool VideoDecoderConfig::IsValidConfig() const {
   return codec_ != kUnknownVideoCodec &&
-      aspect_ratio_numerator_ > 0 &&
-      aspect_ratio_denominator_ > 0 &&
+      natural_size_.width() > 0 &&
+      natural_size_.height() > 0 &&
       VideoFrame::IsValidConfig(
           format_, natural_size_.width(), natural_size_.height());
 }
@@ -160,9 +135,7 @@ std::string VideoDecoderConfig::AsHumanReadableString() const {
     << "," << visible_rect().width()
     << "," << visible_rect().height() << "]"
     << " natural size: [" << natural_size().width()
-    << "," << natural_size().height() << "]"
-    << " aspect ratio: " << aspect_ratio_numerator()
-    << "/" << aspect_ratio_denominator();
+    << "," << natural_size().height() << "]";
   return s.str();
 }
 
@@ -190,14 +163,6 @@ gfx::Size VideoDecoderConfig::natural_size() const {
   return natural_size_;
 }
 
-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();
 }