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

media/base/video_frame.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 "media/base/video_frame.h"
 
 #include "base/logging.h"
 #include "base/string_piece.h"
 #include "media/base/limits.h"
 #include "media/base/video_util.h"
 #if !defined(OS_ANDROID)
 #include "media/ffmpeg/ffmpeg_common.h"
 #endif
 
 #include <algorithm>
 
 namespace media {
 
 // static
 scoped_refptr<VideoFrame> VideoFrame::CreateFrame(
     VideoFrame::Format format,
-    size_t width,
-    size_t height,
+    const gfx::Size& size,
+    const gfx::Size& natural_size,
     base::TimeDelta timestamp) {
-  DCHECK(IsValidConfig(format, width, height));
+  DCHECK(IsValidConfig(format, size));
   scoped_refptr<VideoFrame> frame(new VideoFrame(
-      format, width, height, timestamp));
+      format, size, natural_size, timestamp));
   switch (format) {
     case VideoFrame::RGB32:
       frame->AllocateRGB(4u);
       break;
     case VideoFrame::YV12:
     case VideoFrame::YV16:
       frame->AllocateYUV();
       break;
     default:
       LOG(FATAL) << "Unsupported frame format: " << format;
   }
   return frame;
 }
 
 // static
-bool VideoFrame::IsValidConfig(
-    VideoFrame::Format format,
-    size_t width,
-    size_t height) {
-
+bool VideoFrame::IsValidConfig(VideoFrame::Format format,
+                               const gfx::Size& size) {

[Ami GONE FROM CHROMIUM, 2012/08/02 17:34:45]

shouldn't this now also inspect natural_size?

[acolwell GONE FROM CHROMIUM, 2012/08/02 20:20:21]

Done.

   return (format != VideoFrame::INVALID &&
-          width > 0 && height > 0 &&
-          width <= limits::kMaxDimension && height <= limits::kMaxDimension &&
-          width * height <= limits::kMaxCanvas);
+          size.width() > 0 && size.height() > 0 &&
+          size.width() <= limits::kMaxDimension &&
+          size.height() <= limits::kMaxDimension &&
+          size.width() * size.height() <= limits::kMaxCanvas);
 }
 
 // static
 scoped_refptr<VideoFrame> VideoFrame::WrapNativeTexture(
     uint32 texture_id,
     uint32 texture_target,
-    size_t width,
-    size_t height,
+    const gfx::Size& size,
+    const gfx::Size& natural_size,
     base::TimeDelta timestamp,
     const base::Closure& no_longer_needed) {
   scoped_refptr<VideoFrame> frame(
-      new VideoFrame(NATIVE_TEXTURE, width, height, timestamp));
+      new VideoFrame(NATIVE_TEXTURE, size, natural_size, timestamp));
   frame->texture_id_ = texture_id;
   frame->texture_target_ = texture_target;
   frame->texture_no_longer_needed_ = no_longer_needed;
   return frame;
 }
 
 // static
 scoped_refptr<VideoFrame> VideoFrame::CreateEmptyFrame() {
   return new VideoFrame(
-      VideoFrame::EMPTY, 0, 0, base::TimeDelta());
+      VideoFrame::EMPTY, gfx::Size(), gfx::Size(), base::TimeDelta());
 }
 
 // static
-scoped_refptr<VideoFrame> VideoFrame::CreateBlackFrame(int width, int height) {
-  DCHECK_GT(width, 0);
-  DCHECK_GT(height, 0);
+scoped_refptr<VideoFrame> VideoFrame::CreateBlackFrame(const gfx::Size& size) {
+  DCHECK(IsValidConfig(VideoFrame::YV12, size));
 
   // Create our frame.
   const base::TimeDelta kZero;
   scoped_refptr<VideoFrame> frame =
-      VideoFrame::CreateFrame(VideoFrame::YV12, width, height, kZero);
+      VideoFrame::CreateFrame(VideoFrame::YV12, size, size, kZero);
 
   // Now set the data to YUV(0,128,128).
   const uint8 kBlackY = 0x00;
   const uint8 kBlackUV = 0x80;
   FillYUV(frame, kBlackY, kBlackUV, kBlackUV);
   return frame;
 }
 
 static inline size_t RoundUp(size_t value, size_t alignment) {
   // Check that |alignment| is a power of 2.
   DCHECK((alignment + (alignment - 1)) == (alignment | (alignment - 1)));
   return ((value + (alignment - 1)) & ~(alignment-1));
 }
 
 static const int kFrameSizeAlignment = 16;
 // Allows faster SIMD YUV convert. Also, FFmpeg overreads/-writes occasionally.
 static const int kFramePadBytes = 15;
 
 void VideoFrame::AllocateRGB(size_t bytes_per_pixel) {
   // Round up to align at least at a 16-byte boundary for each row.
   // This is sufficient for MMX and SSE2 reads (movq/movdqa).
-  size_t bytes_per_row = RoundUp(width_, kFrameSizeAlignment) * bytes_per_pixel;
-  size_t aligned_height = RoundUp(height_, kFrameSizeAlignment);
+  size_t bytes_per_row = RoundUp(size_.width(),
+                                 kFrameSizeAlignment) * bytes_per_pixel;
+  size_t aligned_height = RoundUp(size_.height(), kFrameSizeAlignment);
   strides_[VideoFrame::kRGBPlane] = bytes_per_row;
 #if !defined(OS_ANDROID)
   // TODO(dalecurtis): use DataAligned or so, so this #ifdef hackery
   // doesn't need to be repeated in every single user of aligned data.
   data_[VideoFrame::kRGBPlane] = reinterpret_cast<uint8*>(
       av_malloc(bytes_per_row * aligned_height + kFramePadBytes));
 #else
   data_[VideoFrame::kRGBPlane] = new uint8_t[bytes_per_row * aligned_height];
 #endif
   DCHECK(!(reinterpret_cast<intptr_t>(data_[VideoFrame::kRGBPlane]) & 7));
@@ skipping 11 matching lines @@
   // number to avoid any potential of faulting by code that attempts to access
   // the Y values of the final row, but assumes that the last row of U & V
   // applies to a full two rows of Y.
   size_t y_stride = RoundUp(row_bytes(VideoFrame::kYPlane),
                             kFrameSizeAlignment);
   size_t uv_stride = RoundUp(row_bytes(VideoFrame::kUPlane),
                              kFrameSizeAlignment);
   // The *2 here is because some formats (e.g. h264) allow interlaced coding,
   // and then the size needs to be a multiple of two macroblocks (vertically).
   // See libavcodec/utils.c:avcodec_align_dimensions2().
-  size_t y_height = RoundUp(height_, kFrameSizeAlignment * 2);
+  size_t y_height = RoundUp(size_.height(), kFrameSizeAlignment * 2);
   size_t uv_height = format_ == VideoFrame::YV12 ? y_height / 2 : y_height;
   size_t y_bytes = y_height * y_stride;
   size_t uv_bytes = uv_height * uv_stride;
 
 #if !defined(OS_ANDROID)
   // TODO(dalecurtis): use DataAligned or so, so this #ifdef hackery
   // doesn't need to be repeated in every single user of aligned data.
   // The extra line of UV being allocated is because h264 chroma MC
   // overreads by one line in some cases, see libavcodec/utils.c:
   // avcodec_align_dimensions2() and libavcodec/x86/h264_chromamc.asm:
   // put_h264_chroma_mc4_ssse3().
   uint8* data = reinterpret_cast<uint8*>(
       av_malloc(y_bytes + (uv_bytes * 2 + uv_stride) + kFramePadBytes));
 #else
   uint8* data = new uint8_t[y_bytes + (uv_bytes * 2)];
 #endif
   COMPILE_ASSERT(0 == VideoFrame::kYPlane, y_plane_data_must_be_index_0);
   data_[VideoFrame::kYPlane] = data;
   data_[VideoFrame::kUPlane] = data + y_bytes;
   data_[VideoFrame::kVPlane] = data + y_bytes + uv_bytes;
   strides_[VideoFrame::kYPlane] = y_stride;
   strides_[VideoFrame::kUPlane] = uv_stride;
   strides_[VideoFrame::kVPlane] = uv_stride;
 }
 
 VideoFrame::VideoFrame(VideoFrame::Format format,
-                       size_t width,
-                       size_t height,
+                       const gfx::Size& size,
+                       const gfx::Size& natural_size,
                        base::TimeDelta timestamp)
     : format_(format),
-      width_(width),
-      height_(height),
+      size_(size),
+      natural_size_(natural_size),
       texture_id_(0),
       texture_target_(0),
       timestamp_(timestamp) {
   memset(&strides_, 0, sizeof(strides_));
   memset(&data_, 0, sizeof(data_));
 }
 
 VideoFrame::~VideoFrame() {
   if (format_ == NATIVE_TEXTURE && !texture_no_longer_needed_.is_null()) {
     texture_no_longer_needed_.Run();
@@ skipping 34 matching lines @@
   return false;
 }
 
 int VideoFrame::stride(size_t plane) const {
   DCHECK(IsValidPlane(plane));
   return strides_[plane];
 }
 
 int VideoFrame::row_bytes(size_t plane) const {
   DCHECK(IsValidPlane(plane));
+  int width = size_.width();
   switch (format_) {
     // 32bpp.
     case RGB32:
-      return width_ * 4;
+      return width * 4;
 
     // Planar, 8bpp.
     case YV12:
     case YV16:
       if (plane == kYPlane)
-        return width_;
-      return RoundUp(width_, 2) / 2;
+        return width;
+      return RoundUp(width, 2) / 2;
 
     default:
       break;
   }
 
   // Intentionally leave out non-production formats.
   NOTREACHED() << "Unsupported video frame format: " << format_;
   return 0;
 }
 
 int VideoFrame::rows(size_t plane) const {
   DCHECK(IsValidPlane(plane));
+  int height = size_.height();
   switch (format_) {
     case RGB32:
     case YV16:
-      return height_;
+      return height;
 
     case YV12:
       if (plane == kYPlane)
-        return height_;
-      return RoundUp(height_, 2) / 2;
+        return height;
+      return RoundUp(height, 2) / 2;
 
     default:
       break;
   }
 
   // Intentionally leave out non-production formats.
   NOTREACHED() << "Unsupported video frame format: " << format_;
   return 0;
 }
 
@@ skipping 22 matching lines @@
       break;
     for(int row = 0; row < rows(plane); row++) {
       base::MD5Update(context, base::StringPiece(
           reinterpret_cast<char*>(data(plane) + stride(plane) * row),
           row_bytes(plane)));
     }
   }
 }
 
 }  // namespace media