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

Issues Search
    My Issues | Starred     Open | Closed | All

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: 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
« content/browser/renderer_host/media/video_capture_host.cc ('K') | « media/base/video_frame.cc ('k') | media/capture/content/thread_safe_capture_oracle.cc » ('j') | media/capture/content/thread_safe_capture_oracle.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« content/browser/renderer_host/media/video_capture_host.cc ('K') | « media/base/video_frame.cc ('k') | media/capture/content/thread_safe_capture_oracle.cc » ('j') | media/capture/content/thread_safe_capture_oracle.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698