Index: services/video_capture/video_capture_device_proxy_impl.h |
diff --git a/services/video_capture/video_capture_device_proxy_impl.h b/services/video_capture/video_capture_device_proxy_impl.h |
index 9f972df5f5229077796121884e6009c06521726f..4b21bfb27a1483b54d21b1f670bf621068707738 100644 |
--- a/services/video_capture/video_capture_device_proxy_impl.h |
+++ b/services/video_capture/video_capture_device_proxy_impl.h |
@@ -5,6 +5,7 @@ |
#ifndef SERVICES_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_IMPL_H_ |
#define SERVICES_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_IMPL_H_ |
+#include "media/capture/video/video_capture_device.h" |
#include "services/video_capture/public/interfaces/video_capture_device_proxy.mojom.h" |
namespace video_capture { |
@@ -13,11 +14,29 @@ namespace video_capture { |
// of media::VideoCaptureDevice. |
class VideoCaptureDeviceProxyImpl : public mojom::VideoCaptureDeviceProxy { |
public: |
+ VideoCaptureDeviceProxyImpl( |
+ std::unique_ptr<media::VideoCaptureDevice> device); |
+ ~VideoCaptureDeviceProxyImpl() override; |
+ |
// mojom::VideoCaptureDeviceProxy: |
void Start(mojom::VideoCaptureFormatPtr requested_format, |
mojom::ResolutionChangePolicy resolution_change_policy, |
mojom::PowerLineFrequency power_line_frequency, |
mojom::VideoCaptureDeviceClientPtr client) override; |
+ |
+ static media::VideoCaptureFormat ConvertFromMojoToMedia( |
+ mojom::VideoCaptureFormatPtr format); |
+ static media::VideoPixelFormat ConvertFromMojoToMedia( |
+ media::mojom::VideoFormat format); |
+ static media::VideoPixelStorage ConvertFromMojoToMedia( |
+ mojom::VideoPixelStorage storage); |
+ static media::ResolutionChangePolicy ConvertFromMojoToMedia( |
+ mojom::ResolutionChangePolicy policy); |
+ static media::PowerLineFrequency ConvertFromMojoToMedia( |
+ mojom::PowerLineFrequency frequency); |
mcasas
2016/08/30 01:20:27
All these conversion methods are shouting for a ty
chfremer
2016/08/30 18:22:54
Done.
|
+ |
+ private: |
+ std::unique_ptr<media::VideoCaptureDevice> device_; |
}; |
} // namespace video_capture |