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

content/renderer/media/capture_video_decoder.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 "content/renderer/media/capture_video_decoder.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "media/base/demuxer_stream.h"
@@ skipping 43 matching lines @@
       FROM_HERE,
       base::Bind(&CaptureVideoDecoder::ResetOnDecoderThread, this, closure));
 }
 
 void CaptureVideoDecoder::Stop(const base::Closure& closure) {
   message_loop_proxy_->PostTask(
       FROM_HERE,
       base::Bind(&CaptureVideoDecoder::StopOnDecoderThread, this, closure));
 }
 
-const gfx::Size& CaptureVideoDecoder::natural_size() {
-  return natural_size_;
-}
-
 void CaptureVideoDecoder::PrepareForShutdownHack() {
   message_loop_proxy_->PostTask(
       FROM_HERE,
       base::Bind(&CaptureVideoDecoder::PrepareForShutdownHackOnDecoderThread,
                  this));
 }
 
 void CaptureVideoDecoder::OnStarted(media::VideoCapture* capture) {
   NOTIMPLEMENTED();
 }
@@ skipping 54 matching lines @@
 
   capture_engine_ = vc_manager_->AddDevice(video_stream_id_, this);
 
   statistics_cb_ = statistics_cb;
   status_cb.Run(media::PIPELINE_OK);
   state_ = kNormal;
   capture_engine_->StartCapture(this, capability_);
 }
 
 void CaptureVideoDecoder::ReadOnDecoderThread(const ReadCB& read_cb) {
+  DCHECK_NE(state_, kUnInitialized);
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
   CHECK(read_cb_.is_null());
   read_cb_ = read_cb;
   if (state_ == kPaused || shutting_down_) {
     DeliverFrame(media::VideoFrame::CreateEmptyFrame());
   }
 }
 
 void CaptureVideoDecoder::ResetOnDecoderThread(const base::Closure& closure) {
   DVLOG(1) << "ResetOnDecoderThread";
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
   if (!read_cb_.is_null()) {
     scoped_refptr<media::VideoFrame> video_frame =
-        media::VideoFrame::CreateBlackFrame(natural_size_.width(),
-                                            natural_size_.height());
+        media::VideoFrame::CreateBlackFrame(natural_size_);
     DeliverFrame(video_frame);
   }
   closure.Run();
 }
 
 void CaptureVideoDecoder::StopOnDecoderThread(const base::Closure& closure) {
   DVLOG(1) << "StopOnDecoderThread";
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
   pending_stop_cb_ = closure;
   state_ = kStopped;
@@ skipping 66 matching lines @@
   if (!got_first_frame_) {
     start_time_ = buf->timestamp;
     got_first_frame_ = true;
   }
 
   // Always allocate a new frame.
   //
   // TODO(scherkus): migrate this to proper buffer recycling.
   scoped_refptr<media::VideoFrame> video_frame =
       media::VideoFrame::CreateFrame(media::VideoFrame::YV12,
-                                     natural_size_.width(),
-                                     natural_size_.height(),
+                                     natural_size_, natural_size_,
                                      buf->timestamp - start_time_);
 
   last_frame_timestamp_ = buf->timestamp;
   uint8* buffer = buf->memory_pointer;
 
   // Assume YV12 format. Note that camera gives YUV and media pipeline video
   // renderer asks for YVU. The following code did the conversion.
   DCHECK_EQ(capability_.color, media::VideoCaptureCapability::kI420);
   int y_width = buf->width;
   int y_height = buf->height;
   int uv_width = buf->width / 2;
   int uv_height = buf->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);
 
   DeliverFrame(video_frame);
   capture->FeedBuffer(buf);
 }
 
 void CaptureVideoDecoder::DeliverFrame(
     const scoped_refptr<media::VideoFrame>& video_frame) {
   // Reset the callback before running to protect against reentrancy.
   base::ResetAndReturn(&read_cb_).Run(kOk, video_frame);
 }