Update CaptureVideoDecoder to handle DeviceInfoReceived() calls.

content/renderer/media/capture_video_decoder.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 "content/renderer/media/capture_video_decoder.h"
 
 #include "base/bind.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "media/base/filter_host.h"
 #include "media/base/limits.h"
@@ skipping 101 matching lines @@
   DCHECK(buf);
   message_loop_proxy_->PostTask(
       FROM_HERE,
       base::Bind(&CaptureVideoDecoder::OnBufferReadyOnDecoderThread,
                  this, capture, buf));
 }
 
 void CaptureVideoDecoder::OnDeviceInfoReceived(
     media::VideoCapture* capture,
     const media::VideoCaptureParams& device_info) {
-  NOTIMPLEMENTED();
+  message_loop_proxy_->PostTask(
+      FROM_HERE,
+      base::Bind(&CaptureVideoDecoder::OnDeviceInfoReceivedOnDecoderThread,
+                 this, capture, device_info));
 }
 
 void CaptureVideoDecoder::InitializeOnDecoderThread(
     media::DemuxerStream* demuxer_stream,
     const base::Closure& filter_callback,
     const media::StatisticsCallback& stat_callback) {
-  VLOG(1) << "InitializeOnDecoderThread.";
+  DVLOG(1) << "InitializeOnDecoderThread";
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
 
   capture_engine_ = vc_manager_->AddDevice(video_stream_id_, this);
 
   statistics_callback_ = stat_callback;
   filter_callback.Run();
   state_ = kNormal;
 }
 
 void CaptureVideoDecoder::ReadOnDecoderThread(const ReadCB& callback) {
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
   CHECK(read_cb_.is_null());
   read_cb_ = callback;
 }
 
 void CaptureVideoDecoder::PlayOnDecoderThread(const base::Closure& callback) {
-  VLOG(1) << "PlayOnDecoderThread.";
+  DVLOG(1) << "PlayOnDecoderThread";
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
   callback.Run();
 }
 
 void CaptureVideoDecoder::PauseOnDecoderThread(const base::Closure& callback) {
-  VLOG(1) << "PauseOnDecoderThread.";
+  DVLOG(1) << "PauseOnDecoderThread";
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
   state_ = kPaused;
   media::VideoDecoder::Pause(callback);
 }
 
 void CaptureVideoDecoder::StopOnDecoderThread(const base::Closure& callback) {
-  VLOG(1) << "StopOnDecoderThread.";
+  DVLOG(1) << "StopOnDecoderThread";
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
   pending_stop_cb_ = callback;
   state_ = kStopped;
   capture_engine_->StopCapture(this);
 }
 
 void CaptureVideoDecoder::SeekOnDecoderThread(base::TimeDelta time,
                                               const media::FilterStatusCB& cb) {
-  VLOG(1) << "SeekOnDecoderThread.";
+  DVLOG(1) << "SeekOnDecoderThread";
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
 
   cb.Run(media::PIPELINE_OK);
   state_ = kNormal;
   capture_engine_->StartCapture(this, capability_);
 }
 
 void CaptureVideoDecoder::OnStoppedOnDecoderThread(
     media::VideoCapture* capture) {
-  VLOG(1) << "OnStoppedOnDecoderThread.";
+  DVLOG(1) << "OnStoppedOnDecoderThread";
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
   if (!pending_stop_cb_.is_null())
     media::ResetAndRunCB(&pending_stop_cb_);
   vc_manager_->RemoveDevice(video_stream_id_, this);
 }
 
+void CaptureVideoDecoder::OnDeviceInfoReceivedOnDecoderThread(
+    media::VideoCapture* capture,
+    const media::VideoCaptureParams& device_info) {
+  DCHECK(message_loop_proxy_->BelongsToCurrentThread());
+  if (device_info.width != natural_size_.width() ||
+      device_info.height != natural_size_.height()) {
+    natural_size_.SetSize(device_info.width, device_info.height);
+    host()->SetNaturalVideoSize(natural_size_);
+  }
+}
+
 void CaptureVideoDecoder::OnBufferReadyOnDecoderThread(
     media::VideoCapture* capture,
     scoped_refptr<media::VideoCapture::VideoFrameBuffer> buf) {
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
 
   if (read_cb_.is_null() || kNormal != state_) {
     capture->FeedBuffer(buf);
     return;
   }
 
-  if (buf->width != capability_.width || buf->height != capability_.height) {
-    capability_.width = buf->width;
-    capability_.height = buf->height;
+  // TODO(wjia): should we always expect device to send device info before
+  // any buffer, and buffers should have dimension stated in device info?
+  // Or should we be flexible as in following code?
+  if (buf->width != natural_size_.width() ||
+      buf->height != natural_size_.height()) {
     natural_size_.SetSize(buf->width, buf->height);
     host()->SetNaturalVideoSize(natural_size_);
   }
 
   // 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(),
                                      buf->timestamp - start_time_,
                                      base::TimeDelta::FromMilliseconds(33));
 
   uint8* buffer = buf->memory_pointer;
 
-  // Assume YV12 format.
-  // TODO(vrk): This DCHECK fails in content_unittests ... it should not!
-  // DCHECK(capability_.raw_type == media::VideoFrame::YV12);
-  int y_width = capability_.width;
-  int y_height = capability_.height;
-  int uv_width = capability_.width / 2;
-  int uv_height = capability_.height / 2;  // YV12 format.
+  // 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_.raw_type, media::VideoFrame::I420);
+  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.
   ReadCB read_cb = read_cb_;
   read_cb_.Reset();
   read_cb.Run(video_frame);
 }