Chromium Code Reviews| Index: content/renderer/media/video_capture_impl.cc |
| diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc |
| index ee76c612ed10b6a427e38ece00b1a944d6ecf8b1..52ef7980aedaf9b94dfc78ba86d7cb00a94f2abe 100644 |
| --- a/content/renderer/media/video_capture_impl.cc |
| +++ b/content/renderer/media/video_capture_impl.cc |
| @@ -261,11 +261,12 @@ void VideoCaptureImpl::OnBufferReady(int32_t buffer_id, |
| DVLOG(1) << __func__ << " buffer_id: " << buffer_id; |
| DCHECK(io_task_runner_->BelongsToCurrentThread()); |
| - DCHECK_EQ(media::PIXEL_FORMAT_I420, info->pixel_format); |
| - DCHECK_EQ(media::PIXEL_STORAGE_CPU, info->storage_type); |
| + DCHECK(media::PIXEL_FORMAT_I420 == info->pixel_format || |
| + media::PIXEL_FORMAT_Y16 == info->pixel_format); |
|
mcasas
2016/10/21 00:10:50
Restore the missing
DCHECK_EQ(media::PIXEL_STORAG
aleksandar.stojiljkovic
2016/10/21 22:11:10
Done - no need to have the change here.
|
| if (state_ != VIDEO_CAPTURE_STATE_STARTED || |
| - info->pixel_format != media::PIXEL_FORMAT_I420 || |
| + (info->pixel_format != media::PIXEL_FORMAT_I420 && |
| + info->pixel_format != media::PIXEL_FORMAT_Y16) || |
| info->storage_type != media::PIXEL_STORAGE_CPU) { |
| GetVideoCaptureHost()->ReleaseBuffer(device_id_, buffer_id, |
| gpu::SyncToken(), -1.0); |