Browser-wide audio mirroring for TabCapture API

content/browser/renderer_host/media/media_stream_dispatcher_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h"
 
 #include "content/browser/browser_main_loop.h"
+#include "content/browser/renderer_host/media/web_contents_capture_util.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/common/media/media_stream_options.h"
 #include "googleurl/src/gurl.h"
 
 namespace content {
 
 struct MediaStreamDispatcherHost::StreamRequest {
   StreamRequest() : render_view_id(0), page_request_id(0) {}
   StreamRequest(int render_view_id, int page_request_id)
       : render_view_id(render_view_id),
@@ skipping 116 matching lines @@
            << render_view_id << ", "
            << page_request_id << ", ["
            << " audio:" << components.audio_type
            << " video:" << components.video_type
            << " ], "
            << security_origin.spec() << ")";
 
   std::string label;
   if (components.audio_type == MEDIA_TAB_AUDIO_CAPTURE ||
       components.video_type == MEDIA_TAB_VIDEO_CAPTURE) {
-    const std::string& device_id = components.video_device_id;
-    DCHECK(!device_id.empty());
+    DCHECK(!components.video_device_id.empty());
+
+    // Append our tab capture device id scheme.
+    // TODO(justinlin): This is kind of a hack, but the plumbing for audio

[Alpha Left Google, 2012/11/28 01:04:47]

File a bug and put the link here.

[justinlin, 2012/11/28 14:30:31]

Done.

+    // streams is too complicated to plumb in by type. Will revisit once it's
+    // refactored.
+    const std::string& device_id =
+        WebContentsCaptureUtil::AppendWebContentsDeviceScheme(
+            components.video_device_id);
+
     // TODO(justinlin): Cleanup/get rid of GenerateStreamForDevice and merge
     // with the regular GenerateStream.
     GetManager()->GenerateStreamForDevice(
         this, render_process_id_, render_view_id,
         components, device_id, security_origin, &label);
   } else {
     GetManager()->GenerateStream(this, render_process_id_, render_view_id,
                                  components, security_origin, &label);
   }
   DCHECK(!label.empty());
@@ skipping 60 matching lines @@
                            device_id, type, security_origin, &label);
   DCHECK(!label.empty());
   streams_[label] = StreamRequest(render_view_id, page_request_id);
 }
 
 MediaStreamManager* MediaStreamDispatcherHost::GetManager() {
   return BrowserMainLoop::GetMediaStreamManager();
 }
 
 }  // namespace content