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

Unified Diff: content/browser/renderer_host/media/media_stream_manager.cc

Issue 2258143002: Add GetAssociatedOutputDeviceID support to pulse. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unneeded pulse signatures. 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
Index: content/browser/renderer_host/media/media_stream_manager.cc
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
index 0d549c72f8aec382eb1ace40b0d9b79e4d00dece..c3703ba5915b0e3fd44c7240eb1b4c6c44a416c8 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -1040,6 +1040,11 @@ void MediaStreamManager::TranslateDeviceIdToSourceId(
request->video_type() == MEDIA_DEVICE_VIDEO_CAPTURE) {
device->id = GetHMACForMediaDeviceID(request->salt,
request->security_origin, device->id);
+ if (!device->matched_output_device_id.empty()) {
+ device->matched_output_device_id =
+ GetHMACForMediaDeviceID(request->salt, request->security_origin,
+ device->matched_output_device_id);
+ }
}
}

Powered by Google App Engine
This is Rietveld 408576698