Reland r101418: Fix aspect ratio and clarify video frame dimensions

content/renderer/media/capture_video_decoder.cc

 // 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.
 
 #include "content/renderer/media/capture_video_decoder.h"
 
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "media/base/filter_host.h"
 #include "media/base/limits.h"
 #include "media/base/video_util.h"
@@ skipping 32 matching lines @@
 
 void CaptureVideoDecoder::ProduceVideoFrame(
     scoped_refptr<media::VideoFrame> video_frame) {
   message_loop_proxy_->PostTask(
       FROM_HERE,
       NewRunnableMethod(
           this,
           &CaptureVideoDecoder::ProduceVideoFrameOnDecoderThread, video_frame));
 }
 
-int CaptureVideoDecoder::width() {
-  return capability_.width;
-}
-
-int CaptureVideoDecoder::height() {
-  return capability_.height;
+gfx::Size CaptureVideoDecoder::natural_size() {
+  return gfx::Size(capability_.width, capability_.height);
 }
 
 void CaptureVideoDecoder::Play(media::FilterCallback* callback) {
   message_loop_proxy_->PostTask(
       FROM_HERE,
       NewRunnableMethod(this,
                         &CaptureVideoDecoder::PlayOnDecoderThread,
                         callback));
 }
 
@@ skipping 147 matching lines @@
     capture->FeedBuffer(buf);
     return;
   }
 
   scoped_refptr<media::VideoFrame> video_frame = available_frames_.front();
   available_frames_.pop_front();
 
   if (buf->width != capability_.width || buf->height != capability_.height) {
     capability_.width = buf->width;
     capability_.height = buf->height;
-    host()->SetVideoSize(capability_.width, capability_.height);
+    host()->SetNaturalVideoSize(
+        gfx::Size(capability_.width, capability_.height));
   }
 
   // Check if there's a size change.
   if (static_cast<int>(video_frame->width()) != capability_.width ||
       static_cast<int>(video_frame->height()) != capability_.height) {
     // Allocate new buffer based on the new size.
     video_frame = media::VideoFrame::CreateFrame(media::VideoFrame::YV12,
                                                  capability_.width,
                                                  capability_.height,
                                                  media::kNoTimestamp,
                                                  media::kNoTimestamp);
   }
 
   video_frame->SetTimestamp(buf->timestamp - start_time_);
   video_frame->SetDuration(base::TimeDelta::FromMilliseconds(33));
 
   uint8* buffer = buf->memory_pointer;
 
+  // Assume YV12 format.
+  // TODO(vrk): This DCHECK fails in content_unittests ... it should not!
+  // DCHECK(capability_.raw_type == media::VideoFrame::YV12);
   int y_width = capability_.width;
   int y_height = capability_.height;
   int uv_width = capability_.width / 2;
   int uv_height = capability_.height / 2;  // YV12 format.
   CopyYPlane(buffer, y_width, y_height, video_frame);
   buffer += y_width * y_height;
   CopyUPlane(buffer, uv_width, uv_height, video_frame);
   buffer += uv_width * uv_height;
   CopyVPlane(buffer, uv_width, uv_height, video_frame);
 
   VideoFrameReady(video_frame);
   capture->FeedBuffer(buf);
 }