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 20d5d921fe483fe41c37bcef49429f3b784c9b8b..1b681d73113451a3a3f82f76a1172eba2ce976f9 100644 |
| --- a/content/renderer/media/video_capture_impl.cc |
| +++ b/content/renderer/media/video_capture_impl.cc |
| @@ -258,11 +258,13 @@ void VideoCaptureImpl::OnBufferReady(int32_t buffer_id, |
| mojom::VideoFrameInfoPtr info) { |
| DVLOG(1) << __func__ << " buffer_id: " << buffer_id; |
| DCHECK(io_thread_checker_.CalledOnValidThread()); |
| - DCHECK_EQ(media::PIXEL_FORMAT_I420, info->pixel_format); |
| + DCHECK(media::PIXEL_FORMAT_I420 == info->pixel_format || |
| + media::PIXEL_FORMAT_Y16 == info->pixel_format); |
| DCHECK_EQ(media::PIXEL_STORAGE_CPU, info->storage_type); |
|
mcasas
2016/10/25 22:44:43
This DCHECK and the one in l.261-262 and the if()
aleksandar.stojiljkovic
2016/10/26 14:02:18
One way is to leave the the DCHECK and remove the
aleksandar.stojiljkovic
2016/10/28 18:58:55
mcasas@chromium.org,
I had to modify this: state_
|
| 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); |