diff options
| author | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 23:09:51 +0000 |
|---|---|---|
| committer | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 23:09:51 +0000 |
| commit | abed3c4500a80450285a7b61038e54cc5badf75e (patch) | |
| tree | 7cf3a457b849d9198169709fc5a14b4d499a01c0 /content/renderer/media | |
| parent | 1e0c4d047b47568bcb46e4dac9829ee1b0ed8d12 (diff) | |
| download | chromium_src-abed3c4500a80450285a7b61038e54cc5badf75e.zip chromium_src-abed3c4500a80450285a7b61038e54cc5badf75e.tar.gz chromium_src-abed3c4500a80450285a7b61038e54cc5badf75e.tar.bz2 | |
video decoder doesn't update host with natural size.
It should be video renderer.
reland http://codereview.chromium.org/9856026/
BUG=120192
Review URL: https://chromiumcodereview.appspot.com/9863008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media')
| -rw-r--r-- | content/renderer/media/capture_video_decoder.cc | 2 | ||||
| -rw-r--r-- | content/renderer/media/capture_video_decoder_unittest.cc | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/content/renderer/media/capture_video_decoder.cc b/content/renderer/media/capture_video_decoder.cc index 97626e6..24fe43f 100644 --- a/content/renderer/media/capture_video_decoder.cc +++ b/content/renderer/media/capture_video_decoder.cc @@ -214,7 +214,6 @@ void CaptureVideoDecoder::OnDeviceInfoReceivedOnDecoderThread( 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_); } } @@ -239,7 +238,6 @@ void CaptureVideoDecoder::OnBufferReadyOnDecoderThread( if (buf->width != natural_size_.width() || buf->height != natural_size_.height()) { natural_size_.SetSize(buf->width, buf->height); - host()->SetNaturalVideoSize(natural_size_); } // Need to rebase timestamp with zero as starting point. diff --git a/content/renderer/media/capture_video_decoder_unittest.cc b/content/renderer/media/capture_video_decoder_unittest.cc index a0a5e21..44bcf3e 100644 --- a/content/renderer/media/capture_video_decoder_unittest.cc +++ b/content/renderer/media/capture_video_decoder_unittest.cc @@ -209,7 +209,6 @@ TEST_F(CaptureVideoDecoderTest, OnDeviceInfoReceived) { params.frame_per_second = kFPS; params.session_id = kVideoStreamId; - EXPECT_CALL(host_, SetNaturalVideoSize(expected_size)); decoder_->OnDeviceInfoReceived(vc_impl_.get(), params); message_loop_->RunAllPending(); |