media/capture/video/win/video_capture_device_win.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: media/capture/video/win/video_capture_device_win.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: WebGL video to texture support and readPixels from R16UI for CPU access Created 4 years, 4 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

« gpu/command_buffer/service/texture_manager.cc ('K') | « media/capture/video/win/video_capture_device_mf_win.cc ('k') | media/mojo/common/media_type_converters.cc » ('j') | media/renderers/skcanvas_video_renderer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/capture/video/win/video_capture_device_win.cc

diff --git a/media/capture/video/win/video_capture_device_win.cc b/media/capture/video/win/video_capture_device_win.cc

index 5f1b432dda795b4cf5c5e80cb03907fb1154761d..899d19b0753c05c42dd79f1d702a119b9c21c40d 100644

--- a/media/capture/video/win/video_capture_device_win.cc

+++ b/media/capture/video/win/video_capture_device_win.cc

@@ -11,6 +11,7 @@

#include <list>

#include <utility>

+#include "base/big_endian.h"

#include "base/macros.h"

#include "base/strings/sys_string_conversions.h"

#include "base/win/scoped_co_mem.h"

@@ -163,6 +164,15 @@ VideoCaptureDeviceWin::TranslateMediaSubtypeToPixelFormat(

if (sub_type == pixel_format.sub_type)

return pixel_format.format;

}

+ // TODO(astojilj) Define GUIDs and move this to common place as the code is

+ // replicated around.

+ uint32_t fourcc;

+ base::ReadBigEndian(reinterpret_cast<const char*>(&sub_type.Data1), &fourcc);

+ if (fourcc == 'Z16 ' || fourcc == 'INVZ') {

+ return PIXEL_FORMAT_Y16;

+ } else if (fourcc == 'Y8 ') {

+ return PIXEL_FORMAT_Y8;

+ }

#ifndef NDEBUG

WCHAR guid_str[128];

StringFromGUID2(sub_type, guid_str, arraysize(guid_str));