Implement browser-side logging to WebRtc log

content/browser/renderer_host/media/video_capture_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/video_capture_manager.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_worker_pool.h"
+#include "content/browser/renderer_host/media/media_stream_manager.h"

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

I think this include is the wrong direction.
If you actually want to log device enumeration and open / closing devices why
not only do it in MediaStreamManager.

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

I was originally going to add more logging in a separate CL, but I added video
capture logging to this CL so you can better see the necessity for a static
logging method on MediaStreamManager. PTAL.

 #include "content/browser/renderer_host/media/video_capture_controller.h"
 #include "content/browser/renderer_host/media/video_capture_controller_event_handler.h"
 #include "content/browser/renderer_host/media/web_contents_video_capture_device.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_media_id.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/media_stream_request.h"
 #include "media/base/media_switches.h"
 #include "media/base/scoped_histogram_timer.h"
 #include "media/video/capture/fake_video_capture_device.h"
@@ skipping 403 matching lines @@
               names_snapshot.begin();
           it != names_snapshot.end(); ++it) {
       if (it_device_info->name.id() == it->id()) {
         new_devices_info_cache.push_back(*it_device_info);
         names_snapshot.erase(it);
         break;
       }
     }
   }
 
+  MediaStreamManager::AddLogMessage(
+      "VCM::GADIODT found the following devices:");

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

If there's no devices, will that be clear to the log reader? Should there be a
special log message for that?

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

Sure, added special log message for this case.

   // Get the supported capture formats for the new devices in |names_snapshot|.
   for (media::VideoCaptureDevice::Names::const_iterator it =
            names_snapshot.begin();
        it != names_snapshot.end(); ++it) {
     media::VideoCaptureFormats supported_formats;
     DeviceInfo device_info(*it, media::VideoCaptureFormats());
     switch (artificial_device_source_for_testing_) {
       case DISABLED:
         media::VideoCaptureDevice::GetDeviceSupportedFormats(
             *it, &(device_info.supported_formats));
         break;
       case TEST_PATTERN:
         media::FakeVideoCaptureDevice::GetDeviceSupportedFormats(
             *it, &(device_info.supported_formats));
         break;
       case Y4M_FILE:
         media::FileVideoCaptureDevice::GetDeviceSupportedFormats(
             *it, &(device_info.supported_formats));
         break;
     }
     new_devices_info_cache.push_back(device_info);
+    MediaStreamManager::AddLogMessage(device_info.name.GetNameAndModel() + "(" +

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

Perhaps " ("? (Space added)

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

Done.

+                                      device_info.name.id());

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

End string with ")"?

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

Done.

   }
   return new_devices_info_cache;
 }
 
 VideoCaptureManager::DeviceEntry*
 VideoCaptureManager::GetDeviceEntryForMediaStreamDevice(
     const MediaStreamDevice& device_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   for (DeviceEntries::iterator it = devices_.begin();
@@ skipping 74 matching lines @@
     DeviceInfos& device_vector) {
   for (DeviceInfos::iterator it = device_vector.begin();
        it != device_vector.end(); ++it) {
     if (it->name.id() == id)
       return &(*it);
   }
   return NULL;
 }
 
 }  // namespace content