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

Unified Diff: services/video_capture/device_factory_media_to_mojo_adapter.cc

Issue 2867213004: [Mojo Video Capture] Hook up video capture service behind a feature flag (Closed)
Patch Set: Fix mojo::MakeRequest(&device) happening after base::Passed(&device). Created 3 years, 7 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/device_factory_media_to_mojo_adapter.cc
diff --git a/services/video_capture/device_factory_media_to_mojo_adapter.cc b/services/video_capture/device_factory_media_to_mojo_adapter.cc
index b72412709e164d1ae3d3b557c7d239663534a485..271fe60eaddde310dc08c87f0a3fb8b88b195145 100644
--- a/services/video_capture/device_factory_media_to_mojo_adapter.cc
+++ b/services/video_capture/device_factory_media_to_mojo_adapter.cc
@@ -36,15 +36,13 @@ static void TranslateDeviceInfos(
for (const auto& format : device_info.supported_formats) {
media::VideoCaptureFormat translated_format;
switch (format.pixel_format) {
- case media::PIXEL_FORMAT_I420:
- case media::PIXEL_FORMAT_MJPEG:
- translated_format.pixel_format = media::PIXEL_FORMAT_I420;
- break;
case media::PIXEL_FORMAT_Y16:
translated_format.pixel_format = media::PIXEL_FORMAT_Y16;
+ break;
default:
- // Any other format cannot be consumed by VideoCaptureDeviceClient.
- continue;
+ // Any other format gets converted to I420.
+ translated_format.pixel_format = media::PIXEL_FORMAT_I420;
+ break;
}
mcasas 2017/05/10 02:33:33 translated_format.pixel_format = format.pi
chfremer 2017/05/10 17:59:40 Done.
translated_format.frame_size = format.frame_size;
translated_format.frame_rate = format.frame_rate;

Powered by Google App Engine
This is Rietveld 408576698