Windows video capture: Remove duplicated code from GetDeviceSupportedFormats*

media/video/capture/win/video_capture_device_mf_win.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 "media/video/capture/win/video_capture_device_mf_win.h"
 
 #include <mfapi.h>
 #include <mferror.h>
 
 #include "base/memory/ref_counted.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/win/scoped_co_mem.h"
 #include "base/win/windows_version.h"
 #include "media/video/capture/win/capability_list_win.h"
 
 using base::win::ScopedCoMem;
 using base::win::ScopedComPtr;
 
 namespace media {
 
 // In Windows device identifiers, the USB VID and PID are preceded by the string
 // "vid_" or "pid_".  The identifiers are each 4 bytes long.
 const char kVidPrefix[] = "vid_";  // Also contains '\0'.
 const char kPidPrefix[] = "pid_";  // Also contains '\0'.
 const size_t kVidPidSize = 4;
 
-static bool GetFrameSize(IMFMediaType* type, gfx::Size* frame_size) {
-  UINT32 width32, height32;
-  if (FAILED(MFGetAttributeSize(type, MF_MT_FRAME_SIZE, &width32, &height32)))
+static bool FillCapabilitiesFromType(IMFMediaType* type,
+                                     VideoCaptureFormat* format) {
+  UINT32 width, height;
+  HRESULT hr = MFGetAttributeSize(type, MF_MT_FRAME_SIZE, &width, &height);
+  if (FAILED(hr)) {
+    DLOG(ERROR) << "MFGetAttributeSize failed: "
+                << logging::SystemErrorCodeToString(hr);
     return false;
-  frame_size->SetSize(width32, height32);
+  }
+
+  UINT32 numerator, denominator;
+  hr = MFGetAttributeRatio(type, MF_MT_FRAME_RATE, &numerator, &denominator);
+  if (FAILED(hr)) {
+    DLOG(ERROR) << "MFGetAttributeSize failed: "
+                << logging::SystemErrorCodeToString(hr);
+    return false;
+  }
+
+  GUID type_guid;
+  hr = type->GetGUID(MF_MT_SUBTYPE, &type_guid);
+  if (FAILED(hr)) {
+    DLOG(ERROR) << "GetGUID failed: " << logging::SystemErrorCodeToString(hr);
+    return false;
+  }
+
+  format->frame_size.SetSize(width, height);
+  format->frame_rate =
+      denominator ? static_cast<float>(numerator) / denominator : 0.0f;
+  VideoCaptureDeviceMFWin::FormatFromGuid(type_guid, &format->pixel_format);
   return true;
 }
 
-static bool GetFrameRate(IMFMediaType* type,
-                         int* frame_rate_numerator,
-                         int* frame_rate_denominator) {
-  UINT32 numerator, denominator;
-  if (FAILED(MFGetAttributeRatio(type, MF_MT_FRAME_RATE, &numerator,
-                                 &denominator))||
-      !denominator) {
-    return false;
-  }
-  *frame_rate_numerator = numerator;
-  *frame_rate_denominator = denominator;
-  return true;
-}
-
-static bool FillCapabilitiesFromType(IMFMediaType* type,
-                                     VideoCaptureCapabilityWin* capability) {
-  GUID type_guid;
-  if (FAILED(type->GetGUID(MF_MT_SUBTYPE, &type_guid)) ||
-      !GetFrameSize(type, &capability->supported_format.frame_size) ||
-      !GetFrameRate(type,
-                    &capability->frame_rate_numerator,
-                    &capability->frame_rate_denominator) ||
-      !VideoCaptureDeviceMFWin::FormatFromGuid(type_guid,
-          &capability->supported_format.pixel_format)) {
-    return false;
-  }
-  capability->supported_format.frame_rate =
-      capability->frame_rate_numerator / capability->frame_rate_denominator;
-
-  return true;
-}
-
-HRESULT FillCapabilities(IMFSourceReader* source,
-                         CapabilityList* capabilities) {
+// static
+HRESULT VideoCaptureDeviceMFWin::FillCapabilities(
+    IMFSourceReader* source,
+    CapabilityList* capabilities) {
   DWORD stream_index = 0;
   ScopedComPtr<IMFMediaType> type;
   HRESULT hr;
-  for (hr = source->GetNativeMediaType(kFirstVideoStream, stream_index,
-                                       type.Receive());
-       SUCCEEDED(hr);
-       hr = source->GetNativeMediaType(kFirstVideoStream, stream_index,
-                                       type.Receive())) {
+  while (SUCCEEDED(hr = source->GetNativeMediaType(
+                       kFirstVideoStream, stream_index, type.Receive()))) {

[perkj_chrome, 2014/09/19 10:04:55]

indentation.
while (SUCCEEDED(hr = source->GetNativeMediaType(
    kFirstVideoStream, stream_index,type.Receive()))) {   


I think.....

     VideoCaptureCapabilityWin capability(stream_index++);
-    if (FillCapabilitiesFromType(type, &capability))
+    if (FillCapabilitiesFromType(type, &capability.supported_format))
       capabilities->Add(capability);
     type.Release();
   }
 
   if (capabilities->empty() && (SUCCEEDED(hr) || hr == MF_E_NO_MORE_TYPES))
     hr = HRESULT_FROM_WIN32(ERROR_EMPTY);
 
   return (hr == MF_E_NO_MORE_TYPES) ? S_OK : hr;
 }
 
@@ skipping 242 matching lines @@
 
 void VideoCaptureDeviceMFWin::OnError(HRESULT hr) {
   if (client_.get()) {
     client_->OnError(
         base::StringPrintf("VideoCaptureDeviceMFWin: %s",
                            logging::SystemErrorCodeToString(hr).c_str()));
   }
 }
 
 }  // namespace media