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

Unified Diff: services/video_capture/video_capture_device_proxy_impl.cc

Issue 2395163002: VideoCapture: migrate VideoCapture renderer-->host messages to mojo, part 2 (Closed)
Patch Set: rockot@s comments on renaming and return types Created 4 years, 2 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
« no previous file with comments | « services/video_capture/video_capture_device_proxy_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/video_capture/video_capture_device_proxy_impl.cc
diff --git a/services/video_capture/video_capture_device_proxy_impl.cc b/services/video_capture/video_capture_device_proxy_impl.cc
index 3aa5520a5966a1f6d49a93129ea91ac0dba86af0..eeacf359588ea6291e4f989934966914b1be5a38 100644
--- a/services/video_capture/video_capture_device_proxy_impl.cc
+++ b/services/video_capture/video_capture_device_proxy_impl.cc
@@ -4,7 +4,6 @@
#include "base/logging.h"
#include "services/video_capture/device_client_mojo_to_media_adapter.h"
-#include "services/video_capture/mojo_media_conversions.h"
#include "services/video_capture/video_capture_device_proxy_impl.h"
namespace video_capture {
@@ -20,14 +19,13 @@ VideoCaptureDeviceProxyImpl::~VideoCaptureDeviceProxyImpl() {
void VideoCaptureDeviceProxyImpl::Start(
const media::VideoCaptureFormat& requested_format,
- mojom::ResolutionChangePolicy resolution_change_policy,
- mojom::PowerLineFrequency power_line_frequency,
+ media::ResolutionChangePolicy resolution_change_policy,
+ media::PowerLineFrequency power_line_frequency,
mojom::VideoCaptureDeviceClientPtr client) {
media::VideoCaptureParams params;
params.requested_format = requested_format;
- params.resolution_change_policy =
- ConvertFromMojoToMedia(resolution_change_policy);
- params.power_line_frequency = ConvertFromMojoToMedia(power_line_frequency);
+ params.resolution_change_policy = resolution_change_policy;
+ params.power_line_frequency = power_line_frequency;
client.set_connection_error_handler(
base::Bind(&VideoCaptureDeviceProxyImpl::OnClientConnectionErrorOrClose,
base::Unretained(this)));
« no previous file with comments | « services/video_capture/video_capture_device_proxy_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698