Reland r101418: Fix aspect ratio and clarify video frame dimensions

media/video/video_decode_engine.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.
 
 #ifndef MEDIA_VIDEO_VIDEO_DECODE_ENGINE_H_
 #define MEDIA_VIDEO_VIDEO_DECODE_ENGINE_H_
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_export.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
+#include "ui/gfx/size.h"
 
 class MessageLoop;
 
 namespace media {
 
 class Buffer;
 class VideoDecodeContext;
 
 struct PipelineStatistics;
 
 struct VideoCodecInfo {
   // Other parameter is only meaningful when this is true.
   bool success;
 
-  // Can be different with container's value.
-  uint32 surface_width;
-
-  // Can be different with container's value.
-  uint32 surface_height;
+  // Natural dimensions of video. May be different from coded and visible sizes.
+  gfx::Size natural_size;
 };
 
 class MEDIA_EXPORT VideoDecodeEngine {
  public:
   struct MEDIA_EXPORT EventHandler {
    public:
     virtual ~EventHandler() {}
     virtual void OnInitializeComplete(const VideoCodecInfo& info) = 0;
     virtual void OnUninitializeComplete() = 0;
     virtual void OnFlushComplete() = 0;
@@ skipping 79 matching lines @@
   // is called by the user to return the video frame object.
   //
   // In response to this method call, ConsumeVideoFrame() is called with a
   // video frame object containing decoded video content.
   virtual void ProduceVideoFrame(scoped_refptr<VideoFrame> frame) = 0;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_VIDEO_DECODE_ENGINE_H_