Add config change support to FFmpegVideoDecoder

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,
     base::TimeDelta timestamp,
     base::TimeDelta duration) {
+  return VideoFrame::CreateFrame(format, width, height, width, height,
+                                 timestamp, duration);
+}
+
+scoped_refptr<VideoFrame> VideoFrame::CreateFrame(
+    VideoFrame::Format format,
+    size_t width,
+    size_t height,
+    size_t natural_width,
+    size_t natural_height,
+    base::TimeDelta timestamp,
+    base::TimeDelta duration) {
   DCHECK(IsValidConfig(format, width, height));
   scoped_refptr<VideoFrame> frame(new VideoFrame(
-      format, width, height, timestamp, duration));
+      format, width, height, natural_width, natural_height,
+      timestamp, duration));
   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;
@@ skipping 12 matching lines @@
           width <= limits::kMaxDimension && height <= limits::kMaxDimension &&
           width * height <= limits::kMaxCanvas);
 }
 
 // static
 scoped_refptr<VideoFrame> VideoFrame::WrapNativeTexture(
     uint32 texture_id,
     uint32 texture_target,
     size_t width,
     size_t height,
+    size_t natural_width,
+    size_t natural_height,
     base::TimeDelta timestamp,
     base::TimeDelta duration,
     const base::Closure& no_longer_needed) {
   scoped_refptr<VideoFrame> frame(
-      new VideoFrame(NATIVE_TEXTURE, width, height, timestamp, duration));
+      new VideoFrame(NATIVE_TEXTURE, width, height,
+                     natural_width, natural_height,
+                     timestamp, duration));
   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(), base::TimeDelta());
+      VideoFrame::EMPTY, 0, 0, 0, 0, base::TimeDelta(), base::TimeDelta());
 }
 
 // static
 scoped_refptr<VideoFrame> VideoFrame::CreateBlackFrame(int width, int height) {
   DCHECK_GT(width, 0);
   DCHECK_GT(height, 0);
 
   // Create our frame.
   const base::TimeDelta kZero;
   scoped_refptr<VideoFrame> frame =
-      VideoFrame::CreateFrame(VideoFrame::YV12, width, height, kZero, kZero);
+      VideoFrame::CreateFrame(VideoFrame::YV12, width, height, width, height,
+                              kZero, 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.
@@ skipping 56 matching lines @@
   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,
+                       size_t natural_width,
+                       size_t natural_height,
                        base::TimeDelta timestamp,
                        base::TimeDelta duration)
     : format_(format),
       width_(width),
       height_(height),
+      natural_width_(natural_width),
+      natural_height_(natural_height),
       texture_id_(0),
       texture_target_(0),
       timestamp_(timestamp),
       duration_(duration) {
   memset(&strides_, 0, sizeof(strides_));
   memset(&data_, 0, sizeof(data_));
 }
 
 VideoFrame::~VideoFrame() {
   if (format_ == NATIVE_TEXTURE && !texture_no_longer_needed_.is_null()) {
@@ skipping 109 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