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

Unified Diff: services/video_capture/mojo_media_conversions.cc

Issue 2386183002: Replace manual conversions with Mojo type mappings
Patch Set: 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
Index: services/video_capture/mojo_media_conversions.cc
diff --git a/services/video_capture/mojo_media_conversions.cc b/services/video_capture/mojo_media_conversions.cc
deleted file mode 100644
index 258b03ec1e74b3e0e7251fb93da04cfb3e8c0ff4..0000000000000000000000000000000000000000
--- a/services/video_capture/mojo_media_conversions.cc
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "services/video_capture/mojo_media_conversions.h"
-
-namespace video_capture {
-
-void ConvertMojoVideoCaptureSettingsToMediaVideoCaptureParams(
- mojom::VideoCaptureSettingsPtr settings,
- media::VideoCaptureParams* params) {
- params->resolution_change_policy =
- ConvertFromMojoToMedia(settings->resolution_change_policy);
- params->power_line_frequency =
- ConvertFromMojoToMedia(settings->power_line_frequency);
- params->requested_format.pixel_format = media::PIXEL_FORMAT_I420;
- params->requested_format.pixel_storage = media::PIXEL_STORAGE_CPU;
- params->requested_format.frame_size.SetSize(
- settings->format->frame_size.width(),
- settings->format->frame_size.height());
- params->requested_format.frame_rate = settings->format->frame_rate;
-}
-
-media::ResolutionChangePolicy ConvertFromMojoToMedia(
- mojom::ResolutionChangePolicy policy) {
- switch (policy) {
- case mojom::ResolutionChangePolicy::FIXED_RESOLUTION:
- return media::RESOLUTION_POLICY_FIXED_RESOLUTION;
- case mojom::ResolutionChangePolicy::FIXED_ASPECT_RATIO:
- return media::RESOLUTION_POLICY_FIXED_ASPECT_RATIO;
- case mojom::ResolutionChangePolicy::ANY_WITHIN_LIMIT:
- return media::RESOLUTION_POLICY_ANY_WITHIN_LIMIT;
- }
- NOTREACHED();
- return media::RESOLUTION_POLICY_FIXED_RESOLUTION;
-}
-
-media::PowerLineFrequency ConvertFromMojoToMedia(
- mojom::PowerLineFrequency frequency) {
- switch (frequency) {
- case mojom::PowerLineFrequency::DEFAULT:
- return media::PowerLineFrequency::FREQUENCY_DEFAULT;
- case mojom::PowerLineFrequency::HZ_50:
- return media::PowerLineFrequency::FREQUENCY_50HZ;
- case mojom::PowerLineFrequency::HZ_60:
- return media::PowerLineFrequency::FREQUENCY_60HZ;
- }
- NOTREACHED();
- return media::PowerLineFrequency::FREQUENCY_DEFAULT;
-}
-
-media::VideoCaptureDeviceDescriptor ConvertFromMojoToMedia(
- mojom::VideoCaptureDeviceDescriptorPtr descriptor) {
- return media::VideoCaptureDeviceDescriptor(
- descriptor->display_name, descriptor->device_id, descriptor->model_id,
- ConvertFromMojoToMedia(descriptor->capture_api),
- ConvertFromMojoToMedia(descriptor->transport_type));
-}
-
-media::VideoCaptureApi ConvertFromMojoToMedia(mojom::VideoCaptureApi api) {
- switch (api) {
- case mojom::VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE:
- return media::VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE;
- case mojom::VideoCaptureApi::WIN_MEDIA_FOUNDATION:
- return media::VideoCaptureApi::WIN_MEDIA_FOUNDATION;
- case mojom::VideoCaptureApi::WIN_DIRECT_SHOW:
- return media::VideoCaptureApi::WIN_DIRECT_SHOW;
- case mojom::VideoCaptureApi::MACOSX_AVFOUNDATION:
- return media::VideoCaptureApi::MACOSX_AVFOUNDATION;
- case mojom::VideoCaptureApi::MACOSX_DECKLINK:
- return media::VideoCaptureApi::MACOSX_DECKLINK;
- case mojom::VideoCaptureApi::ANDROID_API1:
- return media::VideoCaptureApi::ANDROID_API1;
- case mojom::VideoCaptureApi::ANDROID_API2_LEGACY:
- return media::VideoCaptureApi::ANDROID_API2_LEGACY;
- case mojom::VideoCaptureApi::ANDROID_API2_FULL:
- return media::VideoCaptureApi::ANDROID_API2_FULL;
- case mojom::VideoCaptureApi::ANDROID_API2_LIMITED:
- return media::VideoCaptureApi::ANDROID_API2_LIMITED;
- case mojom::VideoCaptureApi::ANDROID_TANGO:
- return media::VideoCaptureApi::ANDROID_TANGO;
- case mojom::VideoCaptureApi::UNKNOWN:
- return media::VideoCaptureApi::UNKNOWN;
- }
- NOTREACHED();
- return media::VideoCaptureApi::UNKNOWN;
-}
-
-media::VideoCaptureTransportType ConvertFromMojoToMedia(
- mojom::VideoCaptureTransportType transport_type) {
- switch (transport_type) {
- case mojom::VideoCaptureTransportType::MACOSX_USB_OR_BUILT_IN:
- return media::VideoCaptureTransportType::MACOSX_USB_OR_BUILT_IN;
- case mojom::VideoCaptureTransportType::OTHER_TRANSPORT:
- return media::VideoCaptureTransportType::OTHER_TRANSPORT;
- }
- NOTREACHED();
- return media::VideoCaptureTransportType::OTHER_TRANSPORT;
-}
-
-mojom::VideoCaptureFormatPtr ConvertFromMediaToMojo(
- const media::VideoCaptureFormat& format) {
- mojom::VideoCaptureFormatPtr result = mojom::VideoCaptureFormat::New();
- result->frame_size = format.frame_size;
- result->frame_rate = format.frame_rate;
- return result;
-}
-
-mojom::VideoCaptureDeviceDescriptorPtr ConvertFromMediaToMojo(
- const media::VideoCaptureDeviceDescriptor& descriptor) {
- mojom::VideoCaptureDeviceDescriptorPtr result =
- mojom::VideoCaptureDeviceDescriptor::New();
- result->display_name = descriptor.display_name;
- result->device_id = descriptor.device_id;
- result->model_id = descriptor.model_id;
- result->capture_api = ConvertFromMediaToMojo(descriptor.capture_api);
- result->transport_type = ConvertFromMediaToMojo(descriptor.transport_type);
- return result;
-}
-
-mojom::VideoCaptureApi ConvertFromMediaToMojo(media::VideoCaptureApi api) {
- switch (api) {
- case media::VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE:
- return mojom::VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE;
- case media::VideoCaptureApi::WIN_MEDIA_FOUNDATION:
- return mojom::VideoCaptureApi::WIN_MEDIA_FOUNDATION;
- case media::VideoCaptureApi::WIN_DIRECT_SHOW:
- return mojom::VideoCaptureApi::WIN_DIRECT_SHOW;
- case media::VideoCaptureApi::MACOSX_AVFOUNDATION:
- return mojom::VideoCaptureApi::MACOSX_AVFOUNDATION;
- case media::VideoCaptureApi::MACOSX_DECKLINK:
- return mojom::VideoCaptureApi::MACOSX_DECKLINK;
- case media::VideoCaptureApi::ANDROID_API1:
- return mojom::VideoCaptureApi::ANDROID_API1;
- case media::VideoCaptureApi::ANDROID_API2_LEGACY:
- return mojom::VideoCaptureApi::ANDROID_API2_LEGACY;
- case media::VideoCaptureApi::ANDROID_API2_FULL:
- return mojom::VideoCaptureApi::ANDROID_API2_FULL;
- case media::VideoCaptureApi::ANDROID_API2_LIMITED:
- return mojom::VideoCaptureApi::ANDROID_API2_LIMITED;
- case media::VideoCaptureApi::ANDROID_TANGO:
- return mojom::VideoCaptureApi::ANDROID_TANGO;
- case media::VideoCaptureApi::UNKNOWN:
- return mojom::VideoCaptureApi::UNKNOWN;
- }
- NOTREACHED();
- return mojom::VideoCaptureApi::UNKNOWN;
-}
-
-mojom::VideoCaptureTransportType ConvertFromMediaToMojo(
- media::VideoCaptureTransportType transport_type) {
- switch (transport_type) {
- case media::VideoCaptureTransportType::MACOSX_USB_OR_BUILT_IN:
- return mojom::VideoCaptureTransportType::MACOSX_USB_OR_BUILT_IN;
- case media::VideoCaptureTransportType::OTHER_TRANSPORT:
- return mojom::VideoCaptureTransportType::OTHER_TRANSPORT;
- }
- NOTREACHED();
- return mojom::VideoCaptureTransportType::OTHER_TRANSPORT;
-}
-
-} // namespace video_capture
« no previous file with comments | « services/video_capture/mojo_media_conversions.h ('k') | services/video_capture/public/interfaces/typemaps.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698