Reland r101418: Fix aspect ratio and clarify video frame dimensions

media/base/filters.h

Index: media/base/filters.h
diff --git a/media/base/filters.h b/media/base/filters.h
index 180739df46f531f21d74b208bc178ddd61486119..dba2efa849459537528ccfa624b47f802c573c06 100644
--- a/media/base/filters.h
+++ b/media/base/filters.h
@@ -35,6 +35,7 @@
 #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 {
 
@@ -180,15 +181,14 @@ class MEDIA_EXPORT VideoDecoder : public Filter {
     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.