Remove VideoDecoderConfig::aspect_ratio_xxx methods.

media/base/video_decoder_config.cc

 // Copyright (c) 2012 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 <cmath>
-
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 
 namespace media {
 
 VideoDecoderConfig::VideoDecoderConfig()
     : codec_(kUnknownVideoCodec),
       profile_(VIDEO_CODEC_PROFILE_UNKNOWN),
       format_(VideoFrame::INVALID),
-      aspect_ratio_numerator_(0),
-      aspect_ratio_denominator_(0),
       extra_data_size_(0) {
 }
 
 VideoDecoderConfig::VideoDecoderConfig(VideoCodec codec,
                                        VideoCodecProfile profile,
                                        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) {
-  Initialize(codec, profile, format, coded_size, visible_rect,
-             aspect_ratio_numerator, aspect_ratio_denominator,
+  Initialize(codec, profile, format, coded_size, visible_rect, natural_size,
              extra_data, extra_data_size, true);
 }
 
 VideoDecoderConfig::~VideoDecoderConfig() {}
 
 // Some videos just want to watch the world burn, with a height of 0; cap the
 // "infinite" aspect ratio resulting.
 static const int kInfiniteRatio = 99999;
 
 // Common aspect ratios (multiplied by 100 and truncated) used for histogramming
@@ skipping 12 matching lines @@
       size.height() ? (size.width() * 100) / size.height() : kInfiniteRatio,
       base::CustomHistogram::ArrayToCustomRanges(
           kCommonAspectRatios100, arraysize(kCommonAspectRatios100)));
 }
 
 void VideoDecoderConfig::Initialize(VideoCodec codec,
                                     VideoCodecProfile profile,
                                     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) {
   CHECK((extra_data_size != 0) == (extra_data != NULL));
 
   if (record_stats) {
     UMA_HISTOGRAM_ENUMERATION("Media.VideoCodec", codec, kVideoCodecMax + 1);
     // Drop UNKNOWN because U_H_E() uses one bucket for all values less than 1.
     if (profile >= 0) {
       UMA_HISTOGRAM_ENUMERATION("Media.VideoCodecProfile", profile,
                                 VIDEO_CODEC_PROFILE_MAX + 1);
     }
     UMA_HISTOGRAM_COUNTS_10000("Media.VideoCodedWidth", coded_size.width());
     UmaHistogramAspectRatio("Media.VideoCodedAspectRatio", coded_size);
     UMA_HISTOGRAM_COUNTS_10000("Media.VideoVisibleWidth", visible_rect.width());
     UmaHistogramAspectRatio("Media.VideoVisibleAspectRatio", visible_rect);
   }
 
   codec_ = codec;
   profile_ = profile;
   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) {
     extra_data_.reset(new uint8[extra_data_size_]);
     memcpy(extra_data_.get(), extra_data, extra_data_size_);
   } 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) {
   Initialize(video_config.codec(),
              video_config.profile(),
              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);
 }
 
 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());
 }
 
 bool VideoDecoderConfig::Matches(const VideoDecoderConfig& config) const {
   return ((codec() == config.codec()) &&
           (format() == config.format()) &&
           (profile() == config.profile()) &&
           (coded_size() == config.coded_size()) &&
           (visible_rect() == config.visible_rect()) &&
           (natural_size() == config.natural_size()) &&
           (extra_data_size() == config.extra_data_size()) &&
           (!extra_data() || !memcmp(extra_data(), config.extra_data(),
                                     extra_data_size())));
 }
 
 std::string VideoDecoderConfig::AsHumanReadableString() const {
   std::ostringstream s;
   s << "codec: " << codec()
     << " format: " << format()
     << " coded size: [" << coded_size().width()
     << "," << coded_size().height() << "]"
     << " visible rect: [" << visible_rect().x()
     << "," << visible_rect().y()
     << "," << 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();
 }
 
 VideoCodec VideoDecoderConfig::codec() const {
   return codec_;
 }
 
 VideoCodecProfile VideoDecoderConfig::profile() const {
   return profile_;
 }
 
 VideoFrame::Format VideoDecoderConfig::format() const {
   return format_;
 }
 
 gfx::Size VideoDecoderConfig::coded_size() const {
   return coded_size_;
 }
 
 gfx::Rect VideoDecoderConfig::visible_rect() const {
   return visible_rect_;
 }
 
 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();
 }
 
 size_t VideoDecoderConfig::extra_data_size() const {
   return extra_data_size_;
 }
 
 }  // namespace media