media/capture/content/screen_capture_device_core.cc - Issue 1439533004: Remove dead code paths around PIXEL_STORAGE_TEXTURE in capture pipeline.

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/content/screen_capture_device_core.cc

Issue 1439533004: Remove dead code paths around PIXEL_STORAGE_TEXTURE in capture pipeline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: mcasas's second round comments REBASE Created 5 years, 1 month 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: media/capture/content/screen_capture_device_core.cc

diff --git a/media/capture/content/screen_capture_device_core.cc b/media/capture/content/screen_capture_device_core.cc

index d089eae597c7d7abdd4937b9e256c94af74c85bc..5ea04500cd61085e6d8ab8e7838d0f89632c2fd3 100644

--- a/media/capture/content/screen_capture_device_core.cc

+++ b/media/capture/content/screen_capture_device_core.cc

@@ -42,10 +42,8 @@ void ScreenCaptureDeviceCore::AllocateAndStart(

return;

}

- if (!(params.requested_format.pixel_format == PIXEL_FORMAT_I420 &&

- params.requested_format.pixel_storage == PIXEL_STORAGE_CPU) &&

- !(params.requested_format.pixel_format == PIXEL_FORMAT_ARGB &&

- params.requested_format.pixel_storage == PIXEL_STORAGE_TEXTURE)) {

+ if (params.requested_format.pixel_format != PIXEL_FORMAT_I420 ||

+ params.requested_format.pixel_storage != PIXEL_STORAGE_CPU) {

client->OnError(

FROM_HERE,

base::StringPrintf(

« no previous file with comments | « media/base/video_frame.cc ('k') | media/capture/content/thread_safe_capture_oracle.cc » ('j') | no next file with comments »