From 40063134cc09cc6ff6cc03a2b89f93b264343523 Mon Sep 17 00:00:00 2001 From: Jeffy Chen Date: Thu, 19 Dec 2019 14:22:32 +0800 Subject: [PATCH 06/12] media: Enable mojo media when using v4l2 codec on linux The newest chromium turns to use mojo video decoder instead of gpu video decoder. Signed-off-by: Jeffy Chen --- src/3rdparty/chromium/media/media_options.gni | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/3rdparty/chromium/media/media_options.gni b/src/3rdparty/chromium/media/media_options.gni index 011bd47ca2..620f0120dc 100644 --- a/src/3rdparty/chromium/media/media_options.gni +++ b/src/3rdparty/chromium/media/media_options.gni @@ -170,7 +170,8 @@ declare_args() { enable_mojo_media = !is_fuchsia && (is_android || is_chromeos || is_mac || is_win || enable_library_cdms || - (is_desktop_linux && use_vaapi) || is_chromecast) + (is_desktop_linux && use_vaapi) || is_chromecast || + (is_linux && use_v4l2_codec)) # Enable the TestMojoMediaClient to be used in mojo MediaService. This is for # testing only and will override the default platform MojoMediaClient, if any. @@ -235,7 +236,8 @@ if (enable_mojo_media) { ] _default_mojo_media_host = "gpu" } else if (is_chromeos || is_mac || is_win || - (is_desktop_linux && use_vaapi)) { + (is_desktop_linux && use_vaapi) || + (is_linux && use_v4l2_codec)) { _default_mojo_media_services = [ "video_decoder" ] _default_mojo_media_host = "gpu" } -- 2.20.1