| Index: media/video/capture/win/video_capture_device_mf_win.h
|
| diff --git a/media/video/capture/win/video_capture_device_mf_win.h b/media/video/capture/win/video_capture_device_mf_win.h
|
| index a9191bd81a2ac04c579cec99e358480d10835494..c9da58c0cc678bcf4e8208dacc23702a5400bf99 100644
|
| --- a/media/video/capture/win/video_capture_device_mf_win.h
|
| +++ b/media/video/capture/win/video_capture_device_mf_win.h
|
| @@ -38,9 +38,9 @@ class MEDIA_EXPORT VideoCaptureDeviceMFWin
|
| bool Init();
|
|
|
| // VideoCaptureDevice implementation.
|
| - virtual void AllocateAndStart(
|
| - const VideoCaptureCapability& capture_format,
|
| - scoped_ptr<VideoCaptureDevice::Client> client) OVERRIDE;
|
| + virtual void AllocateAndStart(const VideoCaptureParams& params,
|
| + scoped_ptr<VideoCaptureDevice::Client> client)
|
| + OVERRIDE;
|
| virtual void StopAndDeAllocate() OVERRIDE;
|
|
|
| // Returns true iff the current platform supports the Media Foundation API
|
| @@ -71,7 +71,7 @@ class MEDIA_EXPORT VideoCaptureDeviceMFWin
|
| base::Lock lock_; // Used to guard the below variables.
|
| scoped_ptr<VideoCaptureDevice::Client> client_;
|
| base::win::ScopedComPtr<IMFSourceReader> reader_;
|
| - VideoCaptureCapability current_setting_;
|
| + VideoCaptureFormat capture_format_;
|
| bool capture_;
|
|
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceMFWin);
|
|
|