Remove fake cricket::VideoCapturer devices.

webrtc/media/devices/devicemanager.cc

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 17 matching lines @@
 #include "webrtc/media/devices/devicemanager.h"
 
 #include "webrtc/base/fileutils.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/pathutils.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/windowpicker.h"
 #include "webrtc/base/windowpickerfactory.h"
 #include "webrtc/media/base/mediacommon.h"
+#include "webrtc/media/base/videocapturer.h"
 #include "webrtc/media/base/videocapturerfactory.h"
 #include "webrtc/media/devices/deviceinfo.h"
-#include "webrtc/media/devices/filevideocapturer.h"
-#include "webrtc/media/devices/yuvframescapturer.h"
 
 #ifdef HAVE_WEBRTC_VIDEO
 #include "webrtc/media/webrtc/webrtcvideocapturerfactory.h"
 #endif  // HAVE_WEBRTC_VIDEO
 
 namespace {
 
 bool StringMatchWithWildcard(
     const std::pair<const std::basic_string<char>, cricket::VideoFormat> key,
     const std::string& val) {
@@ skipping 95 matching lines @@
   }
 
   for (std::vector<Device>::const_iterator it = devices.begin();
       it != devices.end(); ++it) {
     if (name == it->name) {
       *out = *it;
       return true;
     }
   }
 
-  // If |name| is a valid name for a file or yuvframedevice,
-  // return a fake video capturer device.
-  if (GetFakeVideoCaptureDevice(name, out)) {
-    return true;
-  }
-
   return false;
 }
 
-bool DeviceManager::GetFakeVideoCaptureDevice(const std::string& name,
-                                              Device* out) const {
-  if (rtc::Filesystem::IsFile(name)) {
-    *out = FileVideoCapturer::CreateFileVideoCapturerDevice(name);
-    return true;
-  }
-
-  if (name == YuvFramesCapturer::kYuvFrameDeviceName) {
-    *out = YuvFramesCapturer::CreateYuvFramesCapturerDevice();
-    return true;
-  }
-
-  return false;
-}
-
 void DeviceManager::SetVideoCaptureDeviceMaxFormat(
     const std::string& usb_id,
     const VideoFormat& max_format) {
   max_formats_[usb_id] = max_format;
 }
 
 void DeviceManager::ClearVideoCaptureDeviceMaxFormat(
     const std::string& usb_id) {
   max_formats_.erase(usb_id);
 }
 
 VideoCapturer* DeviceManager::CreateVideoCapturer(const Device& device) const {
-  VideoCapturer* capturer = MaybeConstructFakeVideoCapturer(device);
-  if (capturer) {
-    return capturer;
-  }
-
   if (!video_device_capturer_factory_) {
     LOG(LS_ERROR) << "No video capturer factory for devices.";
     return NULL;
   }
-  capturer = video_device_capturer_factory_->Create(device);
+  cricket::VideoCapturer* capturer =
+      video_device_capturer_factory_->Create(device);
   if (!capturer) {
     return NULL;
   }
   LOG(LS_INFO) << "Created VideoCapturer for " << device.name;
   VideoFormat video_format;
   bool has_max = GetMaxFormat(device, &video_format);
   capturer->set_enable_camera_list(has_max);
   if (has_max) {
     capturer->ConstrainSupportedFormats(video_format);
   }
   return capturer;
 }
 
-VideoCapturer* DeviceManager::MaybeConstructFakeVideoCapturer(
-    const Device& device) const {
-  // TODO(hellner): Throw out the creation of a file video capturer once the
-  // refactoring is completed.
-  if (FileVideoCapturer::IsFileVideoCapturerDevice(device)) {
-    FileVideoCapturer* capturer = new FileVideoCapturer;
-    if (!capturer->Init(device)) {
-      delete capturer;
-      return NULL;
-    }
-    LOG(LS_INFO) << "Created file video capturer " << device.name;
-    capturer->set_repeat(FileVideoCapturer::kForever);
-    return capturer;
-  }
-
-  if (YuvFramesCapturer::IsYuvFramesCapturerDevice(device)) {
-    YuvFramesCapturer* capturer = new YuvFramesCapturer();
-    capturer->Init();
-    return capturer;
-  }
-  return NULL;
-}
-
 bool DeviceManager::GetWindows(
     std::vector<rtc::WindowDescription>* descriptions) {
   if (!window_picker_) {
     return false;
   }
   return window_picker_->GetWindowList(descriptions);
 }
 
 bool DeviceManager::GetDesktops(
     std::vector<rtc::DesktopDescription>* descriptions) {
@@ skipping 113 matching lines @@
     if (ShouldDeviceBeIgnored(it->name, exclusion_list)) {
       it = devices->erase(it);
     } else {
       ++it;
     }
   }
   return true;
 }
 
 }  // namespace cricket