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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/media/capture/aura_window_capture_machine.cc

Issue 1210743003: Video capture IPC changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: moo Created 5 years, 6 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
« no previous file with comments | « no previous file | content/browser/media/capture/desktop_capture_device_aura_unittest.cc » ('j') | content/browser/renderer_host/render_message_filter.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/capture/aura_window_capture_machine.cc
diff --git a/content/browser/media/capture/aura_window_capture_machine.cc b/content/browser/media/capture/aura_window_capture_machine.cc
index 87b8623a9a9cc587c567fba34ce00df9eef6892e..cba0fbb037c0202c97c469f712c10d410c748716 100644
--- a/content/browser/media/capture/aura_window_capture_machine.cc
+++ b/content/browser/media/capture/aura_window_capture_machine.cc
@@ -306,8 +306,10 @@ bool AuraWindowCaptureMachine::ProcessCopyOutputResponse(
if (result->IsEmpty() || result->size().IsEmpty() || !desktop_window_)
return false;
- if (capture_params_.requested_format.pixel_format ==
- media::PIXEL_FORMAT_TEXTURE) {
+ if (capture_params_.requested_format.pixel_storage ==
+ media::PIXEL_STORAGE_TEXTURE) {
+ DCHECK_EQ(media::PIXEL_FORMAT_ARGB,
+ capture_params_.requested_format.pixel_format);
DCHECK(!video_frame.get());
cc::TextureMailbox texture_mailbox;
scoped_ptr<cc::SingleReleaseCallback> release_callback;
« no previous file with comments | « no previous file | content/browser/media/capture/desktop_capture_device_aura_unittest.cc » ('j') | content/browser/renderer_host/render_message_filter.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698