Revert 276590 "VideoCaptureDevice Win: Enumerate devices' suppor..."

trunk/src/media/video/capture/win/video_capture_device_factory_win.cc

Index: trunk/src/media/video/capture/win/video_capture_device_factory_win.cc
===================================================================
--- trunk/src/media/video/capture/win/video_capture_device_factory_win.cc	(revision 278553)
+++ trunk/src/media/video/capture/win/video_capture_device_factory_win.cc	(working copy)
@@ -123,8 +123,7 @@
       continue;
     }
 
-    // Find the description or friendly name. TODO(mcasas): Investigate using
-    // FriendlyName before Description, http://crbug.com/383395.
+    // Find the description or friendly name.
     ScopedVariant name;
     hr = prop_bag->Read(L"Description", name.Receive(), 0);
     if (FAILED(hr))
@@ -224,9 +223,7 @@
     device_id.Reset();
     hr = prop_bag->Read(L"DevicePath", device_id.Receive(), 0);
     if (FAILED(hr) || device_id.type() != VT_BSTR) {
-      // If there is no clear DevicePath, try with Description and FriendlyName,
-      // this might happen with non-USB cameras such as DeckLinks. TODO(mcasas):
-      // use FriendlyName before Description, http://crbug.com/383395.
+      // If there is no clear DevicePath, try with Description and FriendlyName.
       ScopedVariant name;
       if (SUCCEEDED(prop_bag->Read(L"Description", name.Receive(), 0)) ||
           SUCCEEDED(prop_bag->Read(L"FriendlyName", name.Receive(), 0))) {
@@ -300,9 +297,8 @@
                                   h->bmiHeader.biHeight);
         // Trust the frame rate from the VIDEOINFOHEADER.
         format.frame_rate = (h->AvgTimePerFrame > 0) ?
-            kSecondsToReferenceTime / static_cast<float>(h->AvgTimePerFrame) :
-            0.0;
-
+            static_cast<int>(kSecondsToReferenceTime / h->AvgTimePerFrame) :
+            0;
         formats->push_back(format);
         DVLOG(1) << device.name() << " resolution: "
              << format.frame_size.ToString() << ", fps: " << format.frame_rate
@@ -349,8 +345,7 @@
       DLOG(ERROR) << "MFGetAttributeSize: " << std::hex << hr;
       return;
     }
-    capture_format.frame_rate = denominator ?
-        numerator / static_cast<float>(denominator) : 0.0f;
+    capture_format.frame_rate = denominator ? numerator / denominator : 0;
 
     GUID type_guid;
     hr = type->GetGUID(MF_MT_SUBTYPE, &type_guid);