704eb8fa15
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
36 lines
1.3 KiB
C++
36 lines
1.3 KiB
C++
/*
|
|
* Copyright (c) 2011 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_HELP_FUNCTIONS_DS_H_
|
|
#define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_HELP_FUNCTIONS_DS_H_
|
|
|
|
#include <dshow.h>
|
|
|
|
DEFINE_GUID(MEDIASUBTYPE_I420, 0x30323449, 0x0000, 0x0010, 0x80, 0x00, 0x00,
|
|
0xAA, 0x00, 0x38, 0x9B, 0x71);
|
|
DEFINE_GUID(MEDIASUBTYPE_HDYC, 0x43594448, 0x0000, 0x0010, 0x80, 0x00, 0x00,
|
|
0xAA, 0x00, 0x38, 0x9B, 0x71);
|
|
|
|
#define RELEASE_AND_CLEAR(p) if (p) { (p) -> Release () ; (p) = NULL ; }
|
|
|
|
namespace webrtc
|
|
{
|
|
namespace videocapturemodule
|
|
{
|
|
LONGLONG GetMaxOfFrameArray(LONGLONG *maxFps, long size);
|
|
|
|
IPin* GetInputPin(IBaseFilter* filter);
|
|
IPin* GetOutputPin(IBaseFilter* filter, REFGUID Category);
|
|
BOOL PinMatchesCategory(IPin *pPin, REFGUID Category);
|
|
|
|
} // namespace videocapturemodule
|
|
} // namespace webrtc
|
|
#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_HELP_FUNCTIONS_DS_H_
|