Remove VideoDecoder::natural_size() & added VideoFrame::natural_size().

media/tools/scaler_bench/scaler_bench.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.
 
 // This tool can be used to measure performace of video frame scaling
 // code. It times performance of the scaler with and without filtering.
 // It also measures performance of the Skia scaler for comparison.
 
 #include <iostream>
 #include <vector>
@@ skipping 16 matching lines @@
 static int dest_width = 1366;
 static int dest_height = 768;
 static int num_frames = 500;
 static int num_buffers = 50;
 
 static double BenchmarkSkia() {
   std::vector<scoped_refptr<VideoFrame> > source_frames;
   ScopedVector<SkBitmap> dest_frames;
   for (int i = 0; i < num_buffers; i++) {
     source_frames.push_back(
-        VideoFrame::CreateBlackFrame(source_width, source_height));
+        VideoFrame::CreateBlackFrame(gfx::Size(source_width, source_height)));
 
     SkBitmap* bitmap = new SkBitmap();
     bitmap->setConfig(SkBitmap::kARGB_8888_Config,
                       dest_width, dest_height);
     bitmap->allocPixels();
     dest_frames.push_back(bitmap);
   }
 
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, source_width, source_height);
@@ skipping 63 matching lines @@
   TimeTicks end = TimeTicks::HighResNow();
   return static_cast<double>((end - start).InMilliseconds()) / num_frames;
 }
 
 static double BenchmarkFilter(media::ScaleFilter filter) {
   std::vector<scoped_refptr<VideoFrame> > source_frames;
   std::vector<scoped_refptr<VideoFrame> > dest_frames;
 
   for (int i = 0; i < num_buffers; i++) {
     source_frames.push_back(
-        VideoFrame::CreateBlackFrame(source_width, source_height));
+        VideoFrame::CreateBlackFrame(gfx::Size(source_width, source_height)));
 
+    gfx::Size dest_size(dest_width, dest_height);
     dest_frames.push_back(
-        VideoFrame::CreateFrame(VideoFrame::RGB32,
-                                dest_width,
-                                dest_height,
+        VideoFrame::CreateFrame(VideoFrame::RGB32, dest_size, dest_size,
                                 TimeDelta::FromSeconds(0)));
   }
 
   TimeTicks start = TimeTicks::HighResNow();
   for (int i = 0; i < num_frames; i++) {
     scoped_refptr<VideoFrame> source_frame = source_frames[i % num_buffers];
     scoped_refptr<VideoFrame> dest_frame = dest_frames[i % num_buffers];
 
     media::ScaleYUVToRGB32(source_frame->data(VideoFrame::kYPlane),
                            source_frame->data(VideoFrame::kUPlane),
@@ skipping 13 matching lines @@
   TimeTicks end = TimeTicks::HighResNow();
   return static_cast<double>((end - start).InMilliseconds()) / num_frames;
 }
 
 static double BenchmarkScaleWithRect() {
   std::vector<scoped_refptr<VideoFrame> > source_frames;
   std::vector<scoped_refptr<VideoFrame> > dest_frames;
 
   for (int i = 0; i < num_buffers; i++) {
     source_frames.push_back(
-        VideoFrame::CreateBlackFrame(source_width, source_height));
+        VideoFrame::CreateBlackFrame(gfx::Size(source_width, source_height)));
 
+    gfx::Size dest_size(dest_width, dest_height);
     dest_frames.push_back(
-        VideoFrame::CreateFrame(VideoFrame::RGB32,
-                                dest_width,
-                                dest_height,
+        VideoFrame::CreateFrame(VideoFrame::RGB32, dest_size, dest_size,
                                 TimeDelta::FromSeconds(0)));
   }
 
   TimeTicks start = TimeTicks::HighResNow();
   for (int i = 0; i < num_frames; i++) {
     scoped_refptr<VideoFrame> source_frame = source_frames[i % num_buffers];
     scoped_refptr<VideoFrame> dest_frame = dest_frames[i % num_buffers];
 
     media::ScaleYUVToRGB32WithRect(
         source_frame->data(VideoFrame::kYPlane),
@@ skipping 92 matching lines @@
   std::cout << "Bilinear Horizontal: "
             << BenchmarkFilter(media::FILTER_BILINEAR_H)
             << "ms/frame" << std::endl;
   std::cout << "Bilinear: " << BenchmarkFilter(media::FILTER_BILINEAR)
             << "ms/frame" << std::endl;
   std::cout << "Bilinear with rect: " << BenchmarkScaleWithRect()
             << "ms/frame" << std::endl;
 
   return 0;
 }