Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(989)

Unified Diff: content/renderer/media/video_capture_impl.cc

Issue 2121043002: 16 bpp video stream capture, render and WebGL usage - Realsense R200 & SR300 support. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
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);

Powered by Google App Engine
This is Rietveld 408576698