This change includes the following: * Skeleton classes for a couple of base MediaFoundation classes (no code yet). See *_mf.*. * Renaming the DirectShow based implementation from "_windows" to "_ds". * Move the VideoCaptureImpl::CreateDeviceInfo() method into video_capture_factory_windows.cc The reason for this is that that's where the other VideoCaptureImpl factory function is and the factory function won't be implementation specific. * Removed use of <initguid.h> from a header file to avoid defining the same guids in multiple object files. (more info here: http://msdn.microsoft.com/en-us/library/windows/desktop/dd375463(v=vs.85).aspx) * Moved a couple of global variables from the capture_delay_values_windows.h header and into device_info_ds.cc since that's the only file that uses those variables. * Delete capture_delay_values_windows.h. * Added a factory function: DeviceInfoDS::Create() that'll create the DirectShow specific implementation. TEST=This is mostly moving code around. The code that is added, is currently "dead". No manual testing needed. BUG=chromium:140545 Review URL: https://webrtc-codereview.appspot.com/967008 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3135 4adac7df-926f-26a2-2b94-8c16560cd09d
83 lines
2.4 KiB
C++
83 lines
2.4 KiB
C++
/*
|
|
* 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 WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_VIDEO_CAPTURE_DS_H_
|
|
#define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_VIDEO_CAPTURE_DS_H_
|
|
|
|
#include "../video_capture_impl.h"
|
|
#include <tchar.h>
|
|
|
|
#include "device_info_ds.h"
|
|
|
|
#define CAPTURE_FILTER_NAME L"VideoCaptureFilter"
|
|
#define SINK_FILTER_NAME L"SinkFilter"
|
|
|
|
namespace webrtc
|
|
{
|
|
namespace videocapturemodule
|
|
{
|
|
// Forward declaraion
|
|
class CaptureSinkFilter;
|
|
|
|
class VideoCaptureDS: public VideoCaptureImpl
|
|
{
|
|
public:
|
|
VideoCaptureDS(const WebRtc_Word32 id);
|
|
|
|
virtual WebRtc_Word32 Init(const WebRtc_Word32 id,
|
|
const char* deviceUniqueIdUTF8);
|
|
|
|
/*************************************************************************
|
|
*
|
|
* Start/Stop
|
|
*
|
|
*************************************************************************/
|
|
virtual WebRtc_Word32
|
|
StartCapture(const VideoCaptureCapability& capability);
|
|
virtual WebRtc_Word32 StopCapture();
|
|
|
|
/**************************************************************************
|
|
*
|
|
* Properties of the set device
|
|
*
|
|
**************************************************************************/
|
|
|
|
virtual bool CaptureStarted();
|
|
virtual WebRtc_Word32 CaptureSettings(VideoCaptureCapability& settings);
|
|
|
|
protected:
|
|
virtual ~VideoCaptureDS();
|
|
|
|
// Help functions
|
|
|
|
WebRtc_Word32
|
|
SetCameraOutput(const VideoCaptureCapability& requestedCapability);
|
|
WebRtc_Word32 DisconnectGraph();
|
|
HRESULT VideoCaptureDS::ConnectDVCamera();
|
|
|
|
DeviceInfoDS _dsInfo;
|
|
|
|
IBaseFilter* _captureFilter;
|
|
IGraphBuilder* _graphBuilder;
|
|
IMediaControl* _mediaControl;
|
|
CaptureSinkFilter* _sinkFilter;
|
|
IPin* _inputSendPin;
|
|
IPin* _outputCapturePin;
|
|
|
|
// Microsoft DV interface (external DV cameras)
|
|
IBaseFilter* _dvFilter;
|
|
IPin* _inputDvPin;
|
|
IPin* _outputDvPin;
|
|
|
|
};
|
|
} // namespace videocapturemodule
|
|
} //namespace webrtc
|
|
#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_VIDEO_CAPTURE_DS_H_
|