Reland r101418: Fix aspect ratio and clarify video frame dimensions

media/base/filters.h

 // Copyright (c) 2011 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.
 
 // Filters are connected in a strongly typed manner, with downstream filters
 // always reading data from upstream filters.  Upstream filters have no clue
 // who is actually reading from them, and return the results via callbacks.
 //
 //                         DemuxerStream(Video) <- VideoDecoder <- VideoRenderer
 // DataSource <- Demuxer <
@@ skipping 17 matching lines @@
 
 #include "base/callback.h"
 #include "base/callback_old.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/media_export.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/video_frame.h"
+#include "ui/gfx/size.h"
 
 namespace media {
 
 class Buffer;
 class Decoder;
 class DemuxerStream;
 class Filter;
 class FilterHost;
 
 struct PipelineStatistics;
@@ skipping 125 matching lines @@
   virtual void ProduceVideoFrame(scoped_refptr<VideoFrame> frame) = 0;
 
   // Installs a permanent callback for passing decoded video output.
   //
   // A NULL frame represents a decoding error.
   typedef base::Callback<void(scoped_refptr<VideoFrame>)> ConsumeVideoFrameCB;
   void set_consume_video_frame_callback(const ConsumeVideoFrameCB& callback) {
     consume_video_frame_callback_ = callback;
   }
 
-  // Returns the width and height of decoded video in pixels.
+  // Returns the natural width and height of decoded video in pixels.
   //
   // Clients should NOT rely on these values to remain constant. Instead, use
   // the width/height from decoded video frames themselves.
   //
   // TODO(scherkus): why not rely on prerolling and decoding a single frame to
   // get dimensions?
-  virtual int width() = 0;
-  virtual int height() = 0;
+  virtual gfx::Size natural_size() = 0;
 
  protected:
   // Executes the permanent callback to pass off decoded video.
   //
   // TODO(scherkus): name this ConsumeVideoFrame() once we fix the TODO in
   // VideoDecodeEngine::EventHandler to remove ConsumeVideoFrame() from there.
   void VideoFrameReady(scoped_refptr<VideoFrame> frame) {
     consume_video_frame_callback_.Run(frame);
   }
 
@@ skipping 63 matching lines @@
   // buffer.
   virtual bool HasEnded() = 0;
 
   // Sets the output volume.
   virtual void SetVolume(float volume) = 0;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_FILTERS_H_