| Index: webrtc/modules/video_capture/windows/sink_filter_ds.h
|
| diff --git a/webrtc/modules/video_capture/windows/sink_filter_ds.h b/webrtc/modules/video_capture/windows/sink_filter_ds.h
|
| index 6be74f69f9b9beecdb562e4a4b0c3a3899c35eba..f065f91eae25601d28003188e912f4e95dcdbe21 100644
|
| --- a/webrtc/modules/video_capture/windows/sink_filter_ds.h
|
| +++ b/webrtc/modules/video_capture/windows/sink_filter_ds.h
|
| @@ -29,14 +29,11 @@ class CaptureSinkFilter;
|
| class CaptureInputPin: public CBaseInputPin
|
| {
|
| public:
|
| - int32_t _moduleId;
|
| -
|
| VideoCaptureCapability _requestedCapability;
|
| VideoCaptureCapability _resultingCapability;
|
| HANDLE _threadHandle;
|
|
|
| - CaptureInputPin(int32_t moduleId,
|
| - IN TCHAR* szName,
|
| + CaptureInputPin(IN TCHAR* szName,
|
| IN CaptureSinkFilter* pFilter,
|
| IN CCritSec * pLock,
|
| OUT HRESULT * pHr,
|
| @@ -56,8 +53,7 @@ public:
|
| CaptureSinkFilter(IN TCHAR * tszName,
|
| IN LPUNKNOWN punk,
|
| OUT HRESULT * phr,
|
| - VideoCaptureExternal& captureObserver,
|
| - int32_t moduleId);
|
| + VideoCaptureExternal& captureObserver);
|
| virtual ~CaptureSinkFilter();
|
|
|
| // --------------------------------------------------------------------
|
| @@ -93,7 +89,6 @@ private:
|
| CCritSec m_crtRecv; // receiver lock; always acquire before filter lock
|
| CaptureInputPin * m_pInput;
|
| VideoCaptureExternal& _captureObserver;
|
| - int32_t _moduleId;
|
| };
|
| } // namespace videocapturemodule
|
| } // namespace webrtc
|
|
|