Reland r101418: Fix aspect ratio and clarify video frame dimensions

webkit/glue/media/video_renderer_impl.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 "webkit/glue/media/video_renderer_impl.h"
 
 #include "base/logging.h"
 #include "media/base/video_frame.h"
 #include "media/base/yuv_convert.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "webkit/glue/webmediaplayer_proxy.h"
 
 namespace webkit_glue {
 
 VideoRendererImpl::VideoRendererImpl(bool pts_logging)
     : last_converted_frame_(NULL),
       pts_logging_(pts_logging) {
 }
 
 VideoRendererImpl::~VideoRendererImpl() {}
 
 bool VideoRendererImpl::OnInitialize(media::VideoDecoder* decoder) {
-  video_size_.SetSize(decoder->width(), decoder->height());
+  natural_size_ = decoder->natural_size();
   bitmap_.setConfig(SkBitmap::kARGB_8888_Config,
-                    decoder->width(), decoder->height());
+                    natural_size_.width(), natural_size_.height());
   bitmap_.allocPixels();
   bitmap_.eraseRGB(0x00, 0x00, 0x00);
   bitmap_.setIsVolatile(true);
   return true;
 }
 
 void VideoRendererImpl::OnStop(media::FilterCallback* callback) {
   if (callback) {
     callback->Run();
     delete callback;
@@ skipping 118 matching lines @@
                              bitmap_.rowBytes(),
                              yuv_type);
     bitmap_.notifyPixelsChanged();
     bitmap_.unlockPixels();
   }
 
   // 2. Paint the bitmap to canvas.
   SkMatrix matrix;
   matrix.setTranslate(static_cast<SkScalar>(dest_rect.x()),
                       static_cast<SkScalar>(dest_rect.y()));
-  if (dest_rect.width()  != video_size_.width() ||
-      dest_rect.height() != video_size_.height()) {
+  if (dest_rect.width()  != natural_size_.width() ||
+      dest_rect.height() != natural_size_.height()) {
     matrix.preScale(SkIntToScalar(dest_rect.width()) /
-                    SkIntToScalar(video_size_.width()),
+                    SkIntToScalar(natural_size_.width()),
                     SkIntToScalar(dest_rect.height()) /
-                    SkIntToScalar(video_size_.height()));
+                    SkIntToScalar(natural_size_.height()));
   }
   SkPaint paint;
   paint.setFlags(SkPaint::kFilterBitmap_Flag);
   canvas->drawBitmapMatrix(bitmap_, matrix, &paint);
 }
 
 void VideoRendererImpl::FastPaint(media::VideoFrame* video_frame,
                                   SkCanvas* canvas,
                                   const gfx::Rect& dest_rect) {
   DCHECK(video_frame->format() == media::VideoFrame::YV12 ||
@@ skipping 90 matching lines @@
                            video_frame->stride(media::VideoFrame::kUPlane),
                            bitmap.rowBytes(),
                            yuv_type,
                            media::ROTATE_0,
                            media::FILTER_BILINEAR);
     bitmap.unlockPixels();
   }
 }
 
 }  // namespace webkit_glue