Reconnect support for DirectShow video capture devices in parallel to MediaFoundation ones.

media/video/capture/video_capture_device_unittest.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 "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread.h"
 #include "media/video/capture/fake_video_capture_device.h"
 #include "media/video/capture/video_capture_device.h"
 #include "media/video/capture/video_capture_types.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_com_initializer.h"
+#include "base/win/windows_version.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
 #include "media/video/capture/android/video_capture_device_android.h"
 #endif
 
 #if defined(OS_MACOSX)
 // Mac/QTKit will always give you the size you ask for and this case will fail.
 #define MAYBE_AllocateBadSize DISABLED_AllocateBadSize
@@ skipping 92 matching lines @@
 #if defined(OS_WIN)
   base::win::ScopedCOMInitializer initialize_com_;
 #endif
   base::WaitableEvent wait_event_;
   scoped_ptr<MockFrameObserver> frame_observer_;
   VideoCaptureDevice::Names names_;
   scoped_ptr<base::MessageLoop> loop_;
 };
 
 TEST_F(VideoCaptureDeviceTest, OpenInvalidDevice) {
+#if defined(OS_WIN)
+  VideoCaptureDevice::Name::CaptureApiType api_type =
+      (base::win::GetVersion() < base::win::VERSION_WIN7)
+          ? VideoCaptureDevice::Name::DIRECT_SHOW
+          : VideoCaptureDevice::Name::MEDIA_FOUNDATION;
+  VideoCaptureDevice::Name device_name("jibberish", "jibberish", api_type);
+#else
   VideoCaptureDevice::Name device_name("jibberish", "jibberish");
+#endif
   VideoCaptureDevice* device = VideoCaptureDevice::Create(device_name);
   EXPECT_TRUE(device == NULL);
 }
 
 TEST_F(VideoCaptureDeviceTest, CaptureVGA) {
   VideoCaptureDevice::GetDeviceNames(&names_);
   if (!names_.size()) {
     DVLOG(1) << "No camera available. Exiting test.";
     return;
   }
 
   scoped_ptr<VideoCaptureDevice> device(
       VideoCaptureDevice::Create(names_.front()));
   ASSERT_FALSE(device.get() == NULL);
 
   // Get info about the new resolution.
-  EXPECT_CALL(*frame_observer_, OnFrameInfo(640, 480, 30, _))
+  EXPECT_CALL(*frame_observer_, OnFrameInfo(640, 480, _, _))
       .Times(1);
 
   EXPECT_CALL(*frame_observer_, OnErr())
       .Times(0);
 
   device->Allocate(640, 480, 30, frame_observer_.get());
   device->Start();
   // Get captured video frames.
   PostQuitTask();
   EXPECT_TRUE(wait_event_.TimedWait(TestTimeouts::action_max_timeout()));
@@ skipping 89 matching lines @@
     DVLOG(1) << "No camera available. Exiting test.";
     return;
   }
   scoped_ptr<VideoCaptureDevice> device(
       VideoCaptureDevice::Create(names_.front()));
   ASSERT_TRUE(device.get() != NULL);
 
   EXPECT_CALL(*frame_observer_, OnErr())
       .Times(0);
   // Get info about the new resolution.
-  EXPECT_CALL(*frame_observer_, OnFrameInfo(640, 480, 30, _));
+  EXPECT_CALL(*frame_observer_, OnFrameInfo(640, 480, 15, _));
 
   device->Allocate(640, 480, 30, frame_observer_.get());
 
   device->Start();
   // Get captured video frames.
   PostQuitTask();
   EXPECT_TRUE(wait_event_.TimedWait(TestTimeouts::action_max_timeout()));
   device->DeAllocate();
 }
 
@@ skipping 44 matching lines @@
   device->Allocate(1280, 720, 30, frame_observer_.get());
 
   device->Start();
   // Get captured video frames.
   PostQuitTask();
   EXPECT_TRUE(wait_event_.TimedWait(TestTimeouts::action_max_timeout()));
   device->DeAllocate();
 }
 
 };  // namespace media