content/browser/renderer_host/media/video_capture_controller.cc - Issue 2121043002: 16 bpp video stream capture, render and WebGL usage - Realsense R200 & SR300 support.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/media/video_capture_controller.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: Tests: cc, skcanvas_video_renderer, wrtcrecorder... Fake capture supports Y16. Created 4 years, 3 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

« cc/output/renderer_pixeltest.cc ('K') | « content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc ('k') | content/browser/renderer_host/media/video_capture_controller_event_handler.h » ('j') | gpu/command_buffer/common/gles2_cmd_utils.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/video_capture_controller.cc

diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc

index 35dad208ec2d6928e3c645f91ea25a68e76ba650..f8efa6e36894fca03a94c131536ffadf5f29eef5 100644

--- a/content/browser/renderer_host/media/video_capture_controller.cc

+++ b/content/browser/renderer_host/media/video_capture_controller.cc

@@ -166,7 +166,9 @@ void VideoCaptureController::AddClient(

// Check that requested VideoCaptureParams are valid and supported. If not,

// report an error immediately and punt.

if (!params.IsValid() ||

- params.requested_format.pixel_format != media::PIXEL_FORMAT_I420 ||

+ !(params.requested_format.pixel_format == media::PIXEL_FORMAT_I420 ||

+ params.requested_format.pixel_format == media::PIXEL_FORMAT_Y8 ||

+ params.requested_format.pixel_format == media::PIXEL_FORMAT_Y16) ||

(params.requested_format.pixel_storage != media::PIXEL_STORAGE_CPU &&

params.requested_format.pixel_storage !=

media::PIXEL_STORAGE_GPUMEMORYBUFFER)) {

@@ -372,7 +374,9 @@ void VideoCaptureController::DoIncomingCapturedVideoFrameOnIOThread(

frame->metadata()->MergeInternalValuesInto(metadata.get());

// Only I420 pixel format is currently supported.

- DCHECK_EQ(frame->format(), media::PIXEL_FORMAT_I420)

+ DCHECK(frame->format() == media::PIXEL_FORMAT_I420 ||

+ frame->format() == media::PIXEL_FORMAT_Y8 ||

+ frame->format() == media::PIXEL_FORMAT_Y16)

<< "Unsupported pixel format: "

<< media::VideoPixelFormatToString(frame->format());

@@ -474,7 +478,8 @@ void VideoCaptureController::DoNewBufferOnIOThread(

handles.push_back(remote_handle);

}

client->event_handler->OnBufferCreated2(client->controller_id, handles,

- buffer->dimensions(), buffer_id);

+ buffer->dimensions(),

+ frame->format(), buffer_id);

break;

}

case media::VideoFrame::STORAGE_SHMEM: {