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

Unified Diff: services/video_capture/video_capture_device_proxy_impl.cc

Issue 2376013002: [Mojo Video Capture] Move conversions between mojom and media types to a separate file (Closed)
Patch Set: mcasas' comments 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
« 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 bb134db6647e16fd20c64cd2d4bc6b759bec355d..2fc33b170515e70a62f5d605d7d5cd942a976377 100644
--- a/services/video_capture/video_capture_device_proxy_impl.cc
+++ b/services/video_capture/video_capture_device_proxy_impl.cc
@@ -4,6 +4,7 @@
#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 {
@@ -45,69 +46,4 @@ void VideoCaptureDeviceProxyImpl::OnClientConnectionErrorOrClose() {
device_->StopAndDeAllocate();
}
-// static
-media::VideoCaptureFormat VideoCaptureDeviceProxyImpl::ConvertFromMojoToMedia(
- mojom::VideoCaptureFormatPtr format) {
- media::VideoCaptureFormat result;
- result.pixel_format = ConvertFromMojoToMedia(format->pixel_format);
- result.pixel_storage = ConvertFromMojoToMedia(format->pixel_storage);
- result.frame_size.SetSize(format->frame_size.width(),
- format->frame_size.height());
- result.frame_rate = format->frame_rate;
- return result;
-}
-
-// static
-media::VideoPixelFormat VideoCaptureDeviceProxyImpl::ConvertFromMojoToMedia(
- media::mojom::VideoFormat format) {
- // Since there are static_asserts in place in
- // media/mojo/common/media_type_converters.cc to guarantee equality of the
- // underlying representations, we can simply static_cast to convert.
- return static_cast<media::VideoPixelFormat>(format);
-}
-
-// static
-media::VideoPixelStorage VideoCaptureDeviceProxyImpl::ConvertFromMojoToMedia(
- mojom::VideoPixelStorage storage) {
- switch (storage) {
- case mojom::VideoPixelStorage::CPU:
- return media::PIXEL_STORAGE_CPU;
- case mojom::VideoPixelStorage::GPUMEMORYBUFFER:
- return media::PIXEL_STORAGE_GPUMEMORYBUFFER;
- }
- NOTREACHED();
- return media::PIXEL_STORAGE_CPU;
-}
-
-// static
-media::ResolutionChangePolicy
-VideoCaptureDeviceProxyImpl::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;
-}
-
-// static
-media::PowerLineFrequency VideoCaptureDeviceProxyImpl::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;
-}
-
} // namespace video_capture
« 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