Reland r101418: Fix aspect ratio and clarify video frame dimensions

content/renderer/media/capture_video_decoder.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 CONTENT_RENDERER_MEDIA_CAPTURE_VIDEO_DECODER_H_
 #define CONTENT_RENDERER_MEDIA_CAPTURE_VIDEO_DECODER_H_
 
 #include <deque>
 
 #include "base/time.h"
@@ skipping 26 matching lines @@
                     const media::FilterStatusCB& cb) OVERRIDE;
   virtual void Pause(media::FilterCallback* callback) OVERRIDE;
   virtual void Stop(media::FilterCallback* callback) OVERRIDE;
 
   // Decoder implementation.
   virtual void Initialize(media::DemuxerStream* demuxer_stream,
                           media::FilterCallback* filter_callback,
                           media::StatisticsCallback* stat_callback) OVERRIDE;
   virtual void ProduceVideoFrame(
       scoped_refptr<media::VideoFrame> video_frame) OVERRIDE;
-  virtual int width() OVERRIDE;
-  virtual int height() OVERRIDE;
+  virtual gfx::Size natural_size() OVERRIDE;
 
   // VideoCapture::EventHandler implementation.
   virtual void OnStarted(media::VideoCapture* capture) OVERRIDE;
   virtual void OnStopped(media::VideoCapture* capture) OVERRIDE;
   virtual void OnPaused(media::VideoCapture* capture) OVERRIDE;
   virtual void OnError(media::VideoCapture* capture, int error_code) OVERRIDE;
   virtual void OnBufferReady(
       media::VideoCapture* capture,
       scoped_refptr<media::VideoCapture::VideoFrameBuffer> buf) OVERRIDE;
   virtual void OnDeviceInfoReceived(
@@ skipping 37 matching lines @@
   scoped_ptr<media::StatisticsCallback> statistics_callback_;
 
   media::VideoCaptureSessionId video_stream_id_;
   media::VideoCapture* capture_engine_;
   base::Time start_time_;
 
   DISALLOW_COPY_AND_ASSIGN(CaptureVideoDecoder);
 };
 
 #endif  // CONTENT_RENDERER_MEDIA_CAPTURE_VIDEO_DECODER_H_