Remove VideoDecoderConfig::aspect_ratio_xxx methods.

media/base/video_util.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_util.h"
 
+#include <cmath>
+
 #include "base/logging.h"
 #include "media/base/video_frame.h"
 
 namespace media {
 
+gfx::Size GetNaturalSize(const gfx::Rect& visible_rect,
+                         int aspect_ratio_numerator,
+                         int aspect_ratio_denominator) {
+  if (aspect_ratio_denominator == 0)
+    return gfx::Size();
+
+  // Calculate the natural size given the aspect ratio and visible rect.
+  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.
+  return gfx::Size(width & ~1, height);
+}
+
 static void CopyPlane(size_t plane, const uint8* source, int stride, int rows,
                       VideoFrame* frame) {
   uint8* dest = frame->data(plane);
   int dest_stride = frame->stride(plane);
 
   // Clamp in case source frame has smaller stride.
   int bytes_to_copy_per_row = std::min(frame->row_bytes(plane), stride);
 
   // Clamp in case source frame has smaller height.
   int rows_to_copy = std::min(frame->rows(plane), rows);
@@ skipping 36 matching lines @@
   int v_row_bytes = frame->row_bytes(VideoFrame::kVPlane);
   for (int i = 0; i < uv_rows; ++i) {
     memset(u_plane, u, u_row_bytes);
     memset(v_plane, v, v_row_bytes);
     u_plane += frame->stride(VideoFrame::kUPlane);
     v_plane += frame->stride(VideoFrame::kVPlane);
   }
 }
 
 }  // namespace media