Remove VideoDecoder::natural_size() & added VideoFrame::natural_size().

webkit/media/skcanvas_video_renderer.cc

 // Copyright (c) 2012 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/media/skcanvas_video_renderer.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"
@@ skipping 91 matching lines @@
   // Project the clip rect to the original video frame, obtains the
   // dimensions of the projected clip rect, "left" and "top" of the rect.
   // The math here are all integer math so we won't have rounding error and
   // write outside of the canvas.
   // We have the assumptions of dest_rect.width() and dest_rect.height()
   // being non-zero, these are valid assumptions since finding intersection
   // above rejects empty rectangle so we just do a DCHECK here.
   DCHECK_NE(0, dest_rect.width());
   DCHECK_NE(0, dest_rect.height());
   size_t frame_clip_width = local_dest_irect.width() *
-      video_frame->width() / local_dest_irect_saved.width();
+      video_frame->data_size().width() / local_dest_irect_saved.width();
   size_t frame_clip_height = local_dest_irect.height() *
-      video_frame->height() / local_dest_irect_saved.height();
+      video_frame->data_size().height() / local_dest_irect_saved.height();
 
   // Project the "left" and "top" of the final destination rect to local
   // coordinates of the video frame, use these values to find the offsets
   // in the video frame to start reading.
   size_t frame_clip_left =
       (local_dest_irect.fLeft - local_dest_irect_saved.fLeft) *
-      video_frame->width() / local_dest_irect_saved.width();
+      video_frame->data_size().width() / local_dest_irect_saved.width();
   size_t frame_clip_top =
       (local_dest_irect.fTop - local_dest_irect_saved.fTop) *
-      video_frame->height() / local_dest_irect_saved.height();
+      video_frame->data_size().height() / local_dest_irect_saved.height();
 
   // Use the "left" and "top" of the destination rect to locate the offset
   // in Y, U and V planes.
   size_t y_offset = video_frame->stride(media::VideoFrame::kYPlane) *
       frame_clip_top + frame_clip_left;
 
   // For format YV12, there is one U, V value per 2x2 block.
   // For format YV16, there is one u, V value per 2x1 block.
   size_t uv_offset = (video_frame->stride(media::VideoFrame::kUPlane) *
                       (frame_clip_top >> y_shift)) + (frame_clip_left >> 1);
@@ skipping 29 matching lines @@
 // |bitmap| will be (re)allocated to match the dimensions of |video_frame|.
 static void ConvertVideoFrameToBitmap(
     const scoped_refptr<media::VideoFrame>& video_frame,
     SkBitmap* bitmap) {
   DCHECK(IsEitherYV12OrYV16(video_frame->format())) << video_frame->format();
   DCHECK(video_frame->stride(media::VideoFrame::kUPlane) ==
          video_frame->stride(media::VideoFrame::kVPlane));
 
   // Check if |bitmap| needs to be (re)allocated.
   if (bitmap->isNull() ||
-      bitmap->width() != static_cast<int>(video_frame->width()) ||
-      bitmap->height() != static_cast<int>(video_frame->height())) {
+      bitmap->width() != video_frame->data_size().width() ||
+      bitmap->height() != video_frame->data_size().height()) {
     bitmap->setConfig(SkBitmap::kARGB_8888_Config,
-                      video_frame->width(),
-                      video_frame->height());
+                      video_frame->data_size().width(),
+                      video_frame->data_size().height());
     bitmap->allocPixels();
     bitmap->setIsVolatile(true);
   }
 
   bitmap->lockPixels();
   media::YUVType yuv_type =
       (video_frame->format() == media::VideoFrame::YV12) ?
       media::YV12 : media::YV16;
   media::ConvertYUVToRGB32(video_frame->data(media::VideoFrame::kYPlane),
                            video_frame->data(media::VideoFrame::kUPlane),
                            video_frame->data(media::VideoFrame::kVPlane),
                            static_cast<uint8*>(bitmap->getPixels()),
-                           video_frame->width(),
-                           video_frame->height(),
+                           video_frame->data_size().width(),
+                           video_frame->data_size().height(),
                            video_frame->stride(media::VideoFrame::kYPlane),
                            video_frame->stride(media::VideoFrame::kUPlane),
                            bitmap->rowBytes(),
                            yuv_type);
   bitmap->notifyPixelsChanged();
   bitmap->unlockPixels();
 }
 
 SkCanvasVideoRenderer::SkCanvasVideoRenderer()
     : last_frame_timestamp_(media::kNoTimestamp()) {
@@ skipping 36 matching lines @@
     ConvertVideoFrameToBitmap(video_frame, &last_frame_);
     last_frame_timestamp_ = video_frame->GetTimestamp();
   }
 
   // Do a slower paint using |last_frame_|.
   paint.setFilterBitmap(true);
   canvas->drawBitmapRect(last_frame_, NULL, dest, &paint);
 }
 
 }  // namespace webkit_media