Add ToString function for media::VideoCaptureFormat

media/video/capture/win/video_capture_device_factory_win.cc

 // Copyright 2014 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 "media/video/capture/win/video_capture_device_factory_win.h"
 
 #include <mfapi.h>
 #include <mferror.h>
 
 #include "base/command_line.h"
@@ skipping 73 matching lines @@
 static bool EnumerateVideoDevicesMediaFoundation(IMFActivate*** devices,
                                                  UINT32* count) {
   ScopedComPtr<IMFAttributes> attributes;
   if (!PrepareVideoCaptureAttributesMediaFoundation(attributes.Receive(), 1))
     return false;
 
   return SUCCEEDED(MFEnumDeviceSources(attributes, devices, count));
 }
 
 static void GetDeviceNamesDirectShow(
     const CLSID class_id,

[tommi (sloooow) - chröme, 2014/09/04 16:36:19]

const &

     const Name::CaptureApiType capture_api_type,
     Names* device_names) {
   DCHECK(device_names);
   DVLOG(1) << " GetDeviceNamesDirectShow";
 
   ScopedComPtr<ICreateDevEnum> dev_enum;
   HRESULT hr = dev_enum.CreateInstance(CLSID_SystemDeviceEnum, NULL,
                                        CLSCTX_INPROC);
   if (FAILED(hr))
     return;
 
   ScopedComPtr<IEnumMoniker> enum_moniker;
   hr = dev_enum->CreateClassEnumerator(class_id, enum_moniker.Receive(), 0);
   // CreateClassEnumerator returns S_FALSE on some Windows OS
   // when no camera exist. Therefore the FAILED macro can't be used.
   if (hr != S_OK)
     return;
 
   // Name of a fake DirectShow filter that exist on computers with
   // GTalk installed.
   static const char kGoogleCameraAdapter[] = "google camera adapter";

[tommi (sloooow) - chröme, 2014/09/04 16:36:19]

Can you check with Per if we can remove this?

 
   // Enumerate all video capture devices.
   ScopedComPtr<IMoniker> moniker;
   int index = 0;
   while (enum_moniker->Next(1, moniker.Receive(), NULL) == S_OK) {
     ScopedComPtr<IPropertyBag> prop_bag;
     hr = moniker->BindToStorage(0, 0, IID_IPropertyBag, prop_bag.ReceiveVoid());
     if (FAILED(hr)) {
       moniker.Release();

[tommi (sloooow) - chröme, 2014/09/04 16:36:19]

no need for this if we're returning... however, is it correct to bail on the
first moniker that fails BindToStorage?  Should we continue?

[mcasas, 2014/09/04 16:38:38]

We have a separate CL dealing with this very ScopedComPtr
and it also touches the "google camera adapter" char*   :)
http://crrev.com/541603002

[tommi (sloooow) - chröme, 2014/09/04 16:43:35]

Ah, great.  Saw your comments too in that CL and +1 on those.

       return;
     }
 
     // Find the description or friendly name.
     ScopedVariant name;
     hr = prop_bag->Read(L"Description", name.Receive(), 0);
     if (FAILED(hr))
       hr = prop_bag->Read(L"FriendlyName", name.Receive(), 0);
 
     if (SUCCEEDED(hr) && name.type() == VT_BSTR) {
@@ skipping 131 matching lines @@
         continue;
       VIDEOINFOHEADER* h =
           reinterpret_cast<VIDEOINFOHEADER*>(media_type->pbFormat);
       format.frame_size.SetSize(h->bmiHeader.biWidth,
                                 h->bmiHeader.biHeight);
       // Trust the frame rate from the VIDEOINFOHEADER.
       format.frame_rate = (h->AvgTimePerFrame > 0) ?
           kSecondsToReferenceTime / static_cast<float>(h->AvgTimePerFrame) :
           0.0f;
       formats->push_back(format);
-      DVLOG(1) << device.name() << " resolution: "
-          << format.frame_size.ToString() << ", fps: " << format.frame_rate
-          << ", pixel format: " << format.pixel_format;
+      DVLOG(1) << device.name() << " " << format.ToString();
     }
   }
 }
 
 static void GetDeviceSupportedFormatsMediaFoundation(
     const Name& device,
     VideoCaptureFormats* formats) {
   DVLOG(1) << "GetDeviceSupportedFormatsMediaFoundation for " << device.name();
   ScopedComPtr<IMFMediaSource> source;
   if (!CreateVideoCaptureDeviceMediaFoundation(device.id().c_str(),
@@ skipping 40 matching lines @@
       DLOG(ERROR) << "GetGUID failed: "
                   << logging::SystemErrorCodeToString(hr);
       return;
     }
     VideoCaptureDeviceMFWin::FormatFromGuid(type_guid,
                                             &capture_format.pixel_format);
     type.Release();
     formats->push_back(capture_format);
     ++stream_index;
 
-    DVLOG(1) << device.name() << " resolution: "
-             << capture_format.frame_size.ToString() << ", fps: "
-             << capture_format.frame_rate << ", pixel format: "
-             << capture_format.pixel_format;
+    DVLOG(1) << device.name() << " " << capture_format.ToString();
   }
 }
 
 // Returns true iff the current platform supports the Media Foundation API
 // and that the DLLs are available.  On Vista this API is an optional download
 // but the API is advertised as a part of Windows 7 and onwards.  However,
 // we've seen that the required DLLs are not available in some Win7
 // distributions such as Windows 7 N and Windows 7 KN.
 // static
 bool VideoCaptureDeviceFactoryWin::PlatformSupportsMediaFoundation() {
@@ skipping 80 matching lines @@
     const Name& device,
     VideoCaptureFormats* formats) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (use_media_foundation_)
     GetDeviceSupportedFormatsMediaFoundation(device, formats);
   else
     GetDeviceSupportedFormatsDirectShow(device, formats);
 }
 
 }  // namespace media