Delete placeholder code for Windows Media Foundation capturer.

Any new capture implementation for windows should use VideoSourceInterface,
like current capturers for android, mac and ios.

Bug: None
Change-Id: I0dffa9fde5ba069aab6273bfef826d17f03877d2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131337
Commit-Queue: Niels Moller <nisse@webrtc.org>
Commit-Queue: Tommi <tommi@webrtc.org>
Reviewed-by: Tommi <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27483}
This commit is contained in:
Niels Möller
2019-04-08 12:57:16 +02:00
committed by Commit Bot
parent 800a10309d
commit 61e2753500
6 changed files with 0 additions and 182 deletions

View File

@ -80,8 +80,6 @@ if (!build_with_chromium) {
sources = [ sources = [
"windows/device_info_ds.cc", "windows/device_info_ds.cc",
"windows/device_info_ds.h", "windows/device_info_ds.h",
"windows/device_info_mf.cc",
"windows/device_info_mf.h",
"windows/help_functions_ds.cc", "windows/help_functions_ds.cc",
"windows/help_functions_ds.h", "windows/help_functions_ds.h",
"windows/sink_filter_ds.cc", "windows/sink_filter_ds.cc",
@ -89,8 +87,6 @@ if (!build_with_chromium) {
"windows/video_capture_ds.cc", "windows/video_capture_ds.cc",
"windows/video_capture_ds.h", "windows/video_capture_ds.h",
"windows/video_capture_factory_windows.cc", "windows/video_capture_factory_windows.cc",
"windows/video_capture_mf.cc",
"windows/video_capture_mf.h",
] ]
libs = [ "strmiids.lib" ] libs = [ "strmiids.lib" ]

View File

@ -1,48 +0,0 @@
/*
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "modules/video_capture/windows/device_info_mf.h"
namespace webrtc {
namespace videocapturemodule {
DeviceInfoMF::DeviceInfoMF() {}
DeviceInfoMF::~DeviceInfoMF() {}
int32_t DeviceInfoMF::Init() {
return -1;
}
uint32_t DeviceInfoMF::NumberOfDevices() {
return 0;
}
int32_t DeviceInfoMF::GetDeviceName(uint32_t deviceNumber,
char* deviceNameUTF8,
uint32_t deviceNameLength,
char* deviceUniqueIdUTF8,
uint32_t deviceUniqueIdUTF8Length,
char* productUniqueIdUTF8,
uint32_t productUniqueIdUTF8Length) {
return -1;
}
int32_t DeviceInfoMF::DisplayCaptureSettingsDialogBox(
const char* deviceUniqueIdUTF8,
const char* dialogTitleUTF8,
void* parentWindow,
uint32_t positionX,
uint32_t positionY) {
return -1;
}
} // namespace videocapturemodule
} // namespace webrtc

View File

@ -1,46 +0,0 @@
/*
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef MODULES_VIDEO_CAPTURE_WINDOWS_DEVICE_INFO_MF_H_
#define MODULES_VIDEO_CAPTURE_WINDOWS_DEVICE_INFO_MF_H_
#include "modules/video_capture/device_info_impl.h"
namespace webrtc {
namespace videocapturemodule {
// Provides video capture device information using the Media Foundation API.
class DeviceInfoMF : public DeviceInfoImpl {
public:
DeviceInfoMF();
~DeviceInfoMF() override;
int32_t Init() override;
uint32_t NumberOfDevices() override;
int32_t GetDeviceName(uint32_t deviceNumber,
char* deviceNameUTF8,
uint32_t deviceNameLength,
char* deviceUniqueIdUTF8,
uint32_t deviceUniqueIdUTF8Length,
char* productUniqueIdUTF8,
uint32_t productUniqueIdUTF8Length) override;
int32_t DisplayCaptureSettingsDialogBox(const char* deviceUniqueIdUTF8,
const char* dialogTitleUTF8,
void* parentWindow,
uint32_t positionX,
uint32_t positionY) override;
};
} // namespace videocapturemodule
} // namespace webrtc
#endif // MODULES_VIDEO_CAPTURE_WINDOWS_DEVICE_INFO_MF_H_

View File

@ -10,8 +10,6 @@
#include "api/scoped_refptr.h" #include "api/scoped_refptr.h"
#include "modules/video_capture/windows/video_capture_ds.h" #include "modules/video_capture/windows/video_capture_ds.h"
#include "modules/video_capture/windows/video_capture_mf.h"
#include "rtc_base/ref_count.h"
#include "rtc_base/ref_counted_object.h" #include "rtc_base/ref_counted_object.h"
namespace webrtc { namespace webrtc {

View File

@ -1,40 +0,0 @@
/*
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "modules/video_capture/windows/video_capture_mf.h"
namespace webrtc {
namespace videocapturemodule {
VideoCaptureMF::VideoCaptureMF() {}
VideoCaptureMF::~VideoCaptureMF() {}
int32_t VideoCaptureMF::Init(const char* device_id) {
return 0;
}
int32_t VideoCaptureMF::StartCapture(const VideoCaptureCapability& capability) {
return -1;
}
int32_t VideoCaptureMF::StopCapture() {
return -1;
}
bool VideoCaptureMF::CaptureStarted() {
return false;
}
int32_t VideoCaptureMF::CaptureSettings(VideoCaptureCapability& settings) {
return -1;
}
} // namespace videocapturemodule
} // namespace webrtc

View File

@ -1,42 +0,0 @@
/*
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef MODULES_VIDEO_CAPTURE_WINDOWS_VIDEO_CAPTURE_MF_H_
#define MODULES_VIDEO_CAPTURE_WINDOWS_VIDEO_CAPTURE_MF_H_
#include "modules/video_capture/video_capture_impl.h"
namespace webrtc {
namespace videocapturemodule {
// VideoCapture implementation that uses the Media Foundation API on Windows.
// This will replace the DirectShow based implementation on Vista and higher.
// TODO(tommi): Finish implementing and switch out the DS in the factory method
// for supported platforms.
class VideoCaptureMF : public VideoCaptureImpl {
public:
VideoCaptureMF();
int32_t Init(const char* device_id);
// Overrides from VideoCaptureImpl.
int32_t StartCapture(const VideoCaptureCapability& capability) override;
int32_t StopCapture() override;
bool CaptureStarted() override;
int32_t CaptureSettings(VideoCaptureCapability& settings) override; // NOLINT
protected:
~VideoCaptureMF() override;
};
} // namespace videocapturemodule
} // namespace webrtc
#endif // MODULES_VIDEO_CAPTURE_WINDOWS_VIDEO_CAPTURE_MF_H_