Implement browser-side logging to WebRtc log

content/browser/renderer_host/media/media_stream_manager.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_manager.h"
 
 #include <list>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/run_loop.h"
 #include "base/threading/thread.h"
+#include "content/browser/browser_main_loop.h"
 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
 #include "content/browser/renderer_host/media/device_request_message_filter.h"
 #include "content/browser/renderer_host/media/media_stream_requester.h"
 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h"
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 #include "content/browser/renderer_host/media/web_contents_capture_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/media_device_id.h"
 #include "content/public/browser/media_observer.h"
 #include "content/public/browser/media_request_state.h"
+#include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/media_stream_request.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_parameters.h"
 #include "media/base/channel_layout.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_com_initializer.h"
 #endif
 
+static void DoAddLogMessage(const std::string& message) {
+  // Must be on the UI thread to access BrowserMainLoop.
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  content::BrowserMainLoop::GetInstance()->media_stream_manager()->
+      AddLogMessageOnUIThread(message);
+}
+
 namespace content {
 
 namespace {
 // Creates a random label used to identify requests.
 std::string RandomLabel() {
   // An earlier PeerConnection spec,
   // http://dev.w3.org/2011/webrtc/editor/webrtc.html, specified the
   // MediaStream::label alphabet as containing 36 characters from
   // range: U+0021, U+0023 to U+0027, U+002A to U+002B, U+002D to U+002E,
   // U+0030 to U+0039, U+0041 to U+005A, U+005E to U+007E.
@@ skipping 197 matching lines @@
   const GURL security_origin;
 
   const MediaStreamRequestType request_type;
 
   const StreamOptions options;
 
   ResourceContext* resource_context;
 
   StreamDeviceInfoArray devices;
 
+  AddWebRtcLogCallback logging_callback;
+
   // Callback to the requester which audio/video devices have been selected.
   // It can be null if the requester has no interest to know the result.
   // Currently it is only used by |DEVICE_ACCESS| type.
   MediaStreamManager::MediaRequestResponseCallback callback;
 
   scoped_ptr<MediaStreamUIProxy> ui_proxy;
 
  private:
   std::vector<MediaRequestState> state_;
   scoped_ptr<MediaStreamRequest> ui_request_;
@@ skipping 1028 matching lines @@
 #if defined(OS_WIN)
   device_thread_->init_com_with_mta(true);
 #endif
   CHECK(device_thread_->Start());
 
   audio_input_device_manager_ = new AudioInputDeviceManager(audio_manager_);
   audio_input_device_manager_->Register(
       this, device_thread_->message_loop_proxy().get());
 
   video_capture_manager_ = new VideoCaptureManager();
-  video_capture_manager_->Register(this,
-                                   device_thread_->message_loop_proxy().get());
+  video_capture_manager_->Register(
+      this, device_thread_->message_loop_proxy().get());

[Henrik Grunell, 2014/01/17 08:51:25]

Nit: AFAICT from the style guide, the code layout before this change was correct
but not after.

[perkj_chrome, 2014/01/20 11:07:08]

I think Henrik is wrong and vrk is correct :->

[Henrik Grunell, 2014/01/20 16:23:08]

I don't have a very strong opinion on this, do what you think is best. (Follow
the file by all means.) But this is what I can see:
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Function_Calls
(And personally I think the "before" version is easier to read, but that's
another thing.)

[vrk (LEFT CHROMIUM), 2014/01/22 02:25:42]

I believe either way is acceptable, but I reverted the change anyway. (FWIW I
didn't mean to make this style change; I had fiddled around with this call for
experimentation reasons and thought I reverted it back to the original code, but
apparently not :) )

 
   // We want to be notified of IO message loop destruction to delete the thread
   // and the device managers.
   io_loop_ = base::MessageLoop::current();
   io_loop_->AddDestructionObserver(this);
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUseFakeDeviceForMediaStream)) {
     DVLOG(1) << "Using fake device";
     UseFakeDevice();
@@ skipping 68 matching lines @@
   }
 }
 
 void MediaStreamManager::Closed(MediaStreamType stream_type,
                                 int capture_session_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 }
 
 void MediaStreamManager::DevicesEnumerated(
     MediaStreamType stream_type, const StreamDeviceInfoArray& devices) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));

[perkj_chrome, 2014/01/20 11:07:08]

Here all device enumerations end up for both audio and video.
So if you actually wants to log enumeration results - I think this is the place.
Enumerations are triggered if no enumeration has previously been done or a
device has been plugged in or removed. 

As you know, this is not only used by webrtc.

[vrk (LEFT CHROMIUM), 2014/01/22 02:25:42]

OK, done.

   DVLOG(1) << "DevicesEnumerated("
            << ", {stream_type = " << stream_type <<  "})";
 
   // Only cache the device list when the device list has been changed.
   bool need_update_clients = false;
   EnumerationCache* cache =
       stream_type == MEDIA_DEVICE_AUDIO_CAPTURE ?
       &audio_enumeration_cache_ : &video_enumeration_cache_;
   if (!cache->valid ||
       devices.size() != cache->devices.size() ||
@@ skipping 54 matching lines @@
         else
           PostRequestToUI(*it, request);
         break;
     }
   }
   label_list.clear();
   --active_enumeration_ref_count_[stream_type];
   DCHECK_GE(active_enumeration_ref_count_[stream_type], 0);
 }
 
+// static
+void MediaStreamManager::AddLogMessage(const std::string& message) {
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(::DoAddLogMessage, message));
+}
+
+void MediaStreamManager::AddLogMessageOnUIThread(const std::string& message) {
+  // Must be on the UI thread to access RenderProcessHost from process ID.
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  // Add logs for each pending request.
+  for (DeviceRequests::iterator it = requests_.begin(); it != requests_.end();
+       ++it) {
+    DeviceRequest* request = it->second;
+    // Log the message to all renderers that are requesting a MediaStream or
+    // device enumeration.
+    if (request->request_type == MEDIA_GENERATE_STREAM ||
+        request->request_type == MEDIA_ENUMERATE_DEVICES) {
+      content::RenderProcessHost* render_process_host =
+          content::RenderProcessHost::FromID(request->requesting_process_id);
+      render_process_host->WebRtcLogMessage(message);
+    }
+  }
+}
+
 void MediaStreamManager::HandleAccessRequestResponse(
     const std::string& label,
     const MediaStreamDevices& devices) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DVLOG(1) << "HandleAccessRequestResponse("
            << ", {label = " << label <<  "})";
 
   DeviceRequest* request = FindRequest(label);
   if (!request) {
     // The request has been canceled before the UI returned.
@@ skipping 215 matching lines @@
   }
 
   // Always do enumeration even though some enumeration is in progress,
   // because those enumeration commands could be sent before these devices
   // change.
   ++active_enumeration_ref_count_[stream_type];
   GetDeviceManager(stream_type)->EnumerateDevices(stream_type);
 }
 
 }  // namespace content