diff options
Diffstat (limited to 'chromium/media/capture/video/win/video_capture_device_win.h')
| -rw-r--r-- | chromium/media/capture/video/win/video_capture_device_win.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/chromium/media/capture/video/win/video_capture_device_win.h b/chromium/media/capture/video/win/video_capture_device_win.h index 77ca33ccfd4..33166090691 100644 --- a/chromium/media/capture/video/win/video_capture_device_win.h +++ b/chromium/media/capture/video/win/video_capture_device_win.h @@ -13,6 +13,7 @@ #include <dshow.h> #include <stdint.h> #include <vidcap.h> +#include <wrl/client.h> #include <map> #include <string> @@ -20,7 +21,6 @@ #include "base/containers/queue.h" #include "base/macros.h" #include "base/threading/thread_checker.h" -#include "base/win/scoped_comptr.h" #include "media/capture/video/video_capture_device.h" #include "media/capture/video/win/capability_list_win.h" #include "media/capture/video/win/sink_filter_win.h" @@ -61,16 +61,16 @@ class VideoCaptureDeviceWin : public VideoCaptureDevice, bool query_detailed_frame_rates, CapabilityList* out_capability_list); static void GetPinCapabilityList( - base::win::ScopedComPtr<IBaseFilter> capture_filter, - base::win::ScopedComPtr<IPin> output_capture_pin, + Microsoft::WRL::ComPtr<IBaseFilter> capture_filter, + Microsoft::WRL::ComPtr<IPin> output_capture_pin, bool query_detailed_frame_rates, CapabilityList* out_capability_list); static HRESULT GetDeviceFilter(const std::string& device_id, IBaseFilter** filter); - static base::win::ScopedComPtr<IPin> GetPin(IBaseFilter* filter, - PIN_DIRECTION pin_dir, - REFGUID category, - REFGUID major_type); + static Microsoft::WRL::ComPtr<IPin> GetPin(IBaseFilter* filter, + PIN_DIRECTION pin_dir, + REFGUID category, + REFGUID major_type); static VideoPixelFormat TranslateMediaSubtypeToPixelFormat( const GUID& sub_type); @@ -116,14 +116,14 @@ class VideoCaptureDeviceWin : public VideoCaptureDevice, InternalState state_; std::unique_ptr<VideoCaptureDevice::Client> client_; - base::win::ScopedComPtr<IBaseFilter> capture_filter_; + Microsoft::WRL::ComPtr<IBaseFilter> capture_filter_; - base::win::ScopedComPtr<IGraphBuilder> graph_builder_; - base::win::ScopedComPtr<ICaptureGraphBuilder2> capture_graph_builder_; + Microsoft::WRL::ComPtr<IGraphBuilder> graph_builder_; + Microsoft::WRL::ComPtr<ICaptureGraphBuilder2> capture_graph_builder_; - base::win::ScopedComPtr<IMediaControl> media_control_; - base::win::ScopedComPtr<IPin> input_sink_pin_; - base::win::ScopedComPtr<IPin> output_capture_pin_; + Microsoft::WRL::ComPtr<IMediaControl> media_control_; + Microsoft::WRL::ComPtr<IPin> input_sink_pin_; + Microsoft::WRL::ComPtr<IPin> output_capture_pin_; scoped_refptr<SinkFilter> sink_filter_; @@ -132,8 +132,8 @@ class VideoCaptureDeviceWin : public VideoCaptureDevice, VideoCaptureFormat capture_format_; - base::win::ScopedComPtr<ICameraControl> camera_control_; - base::win::ScopedComPtr<IVideoProcAmp> video_control_; + Microsoft::WRL::ComPtr<ICameraControl> camera_control_; + Microsoft::WRL::ComPtr<IVideoProcAmp> video_control_; // These flags keep the manual/auto mode between cycles of SetPhotoOptions(). bool white_balance_mode_manual_; bool exposure_mode_manual_; |