Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(631)

Unified Diff: services/video_capture/video_capture_device_proxy_impl.h

Issue 2238083004: Video Capture Mojo (1.4b): Implement ability to use fake device instance (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@FillServicePart1
Patch Set: Fix control reached end of non-void function. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..8635af6359672bf91a249358cbc0fcb243d2b597 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,32 @@ 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;
+
+ // TODO(chfremer): Consider using Mojo type mapping instead of conversion
+ // methods.
+ // https://crbug.com/642387
+ 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);
+
+ private:
+ std::unique_ptr<media::VideoCaptureDevice> device_;
};
} // namespace video_capture
« no previous file with comments | « services/video_capture/video_capture_device_factory_impl.cc ('k') | services/video_capture/video_capture_device_proxy_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698