RELAND: media/gpu/BUILD.gn: restrict image_processor, video_frame_mapper to CrOs, Chromecast

Original CL got reverted due to breaking ChromiumOS ASAN and
Linux ChromiumOS MSan builders:

[48790/51498] LINK ./content_shell
FAILED: content_shell
../../third_party/llvm-build/Release+Asserts/bin/clang++ -Wl,--fatal-warnings -fPIC -Wl,-z,noexecsta...(too long)
ld.lld: error: undefined symbol: media::ChromeosVideoDecoderFactory::GetSupportedConfigs()
>>> referenced by gpu_mojo_media_client.cc:162 (../../media/mojo/services/gpu_mojo_media_client.cc:162)
>>>               services/gpu_mojo_media_client.o:(media::GpuMojoMediaClient::GetSupportedVideoDecoderConfigs()) in archive obj/media/mojo/services/libmedia_mojo_services.a
clang: error: linker command failed with exit code 1 (use -v to see invocation)

Cq-Include-Trybots:luci-chromium-try:linux_chromium_chromeos_asan_rel_ng;luci-chromium-try:linux_chromium_chromeos_msan_rel_ng


Original CL description ----------------------------------------------

This CL restricts //media/gpu:image_processor and :video_frame_mapper
to ChromeOS and ChromeCast, since they are only implemented for these
platforms.  Same for image_processor_test.

video_frame_file_writer.cc sandwiched some uses of |video_frame_mapper_|
in an OS_LINUX and left others unprotected, which confused OS_WIN
builds. This CL changes those to if defined(OS_CHROMEOS), since I
don't think this file is meant to be compiled nor run on OS_LINUX.

Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1787467
Commit-Queue: Miguel Casas <mcasas@chromium.org>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Yuchen Liu <yucliu@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#698566}
Bug: 1006266
Change-Id: I6c9982015829863694e9f48815105f371548f9a4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1816799Reviewed-by: Dan Sanders <sandersd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#698655}

media/gpu/BUILD.gn

@@ -65,8 +65,6 @@ component("gpu") {
     ":buildflags",
     ":command_buffer_helper",
     ":common",
-    ":image_processor",
-    ":video_frame_mapper",
     "//base",
     "//gpu",
     "//media",
@@ -83,12 +81,14 @@ component("gpu") {
   libs = []
   ldflags = []
 
+  # TODO(crbug.com/1006266): consider using |use_chromeos_video_acceleration|.
   if (use_v4l2_codec || use_vaapi) {
-    public_deps += [ "//media/gpu/linux:common" ]
-  }
-
-  if (is_chromeos) {
-    public_deps += [ "//media/gpu/chromeos" ]
+    public_deps += [
+      ":image_processor",
+      ":video_frame_mapper",
+      "//media/gpu/chromeos",
+      "//media/gpu/linux:common",
+    ]
   }
 
   if (is_mac) {
@@ -260,6 +260,8 @@ source_set("common") {
     "vp9_reference_frame_vector.cc",
     "vp9_reference_frame_vector.h",
   ]
+
+  # TODO(crbug.com/1006266): consider using |use_chromeos_video_acceleration|.
   if (use_v4l2_codec || use_vaapi) {
     sources += [
       "decode_surface_handler.h",
@@ -303,79 +305,82 @@ source_set("command_buffer_helper") {
   ]
 }
 
-source_set("image_processor") {
-  defines = [ "MEDIA_GPU_IMPLEMENTATION" ]
-  sources = [
-    "image_processor_factory.cc",
-    "libyuv_image_processor.cc",
-    "libyuv_image_processor.h",
-  ]
+# TODO(crbug.com/1006266): consider using |use_chromeos_video_acceleration|.
+if (use_v4l2_codec || use_vaapi) {
+  source_set("image_processor") {
+    defines = [ "MEDIA_GPU_IMPLEMENTATION" ]
+    sources = [
+      "image_processor_factory.cc",
+      "libyuv_image_processor.cc",
+      "libyuv_image_processor.h",
+    ]
 
-  public_deps = [
-    ":image_processor_common",
-  ]
+    public_deps = [
+      ":image_processor_common",
+    ]
 
-  deps = [
-    ":video_frame_mapper",
-    "//third_party/libyuv",
-    "//ui/gl",
-  ]
+    deps = [
+      ":video_frame_mapper",
+      "//third_party/libyuv",
+      "//ui/gl",
+    ]
 
-  if (use_v4l2_codec) {
-    deps += [ "//media/gpu/v4l2" ]
+    if (use_v4l2_codec) {
+      deps += [ "//media/gpu/v4l2" ]
+    }
   }
-}
 
-source_set("image_processor_common") {
-  defines = [ "MEDIA_GPU_IMPLEMENTATION" ]
-  sources = [
-    "image_processor.cc",
-    "image_processor.h",
-    "image_processor_factory.h",
-  ]
+  source_set("image_processor_common") {
+    defines = [ "MEDIA_GPU_IMPLEMENTATION" ]
+    sources = [
+      "image_processor.cc",
+      "image_processor.h",
+      "image_processor_factory.h",
+    ]
 
-  public_deps = [
-    ":buildflags",
-    ":common",
-    "//base",
-    "//media",
-    "//ui/gfx/geometry",
-  ]
-}
+    public_deps = [
+      ":buildflags",
+      ":common",
+      "//base",
+      "//media",
+      "//ui/gfx/geometry",
+    ]
+  }
 
-source_set("video_frame_mapper") {
-  defines = [ "MEDIA_GPU_IMPLEMENTATION" ]
-  sources = [
-    "video_frame_mapper_factory.cc",
-  ]
-  public_deps = [
-    ":video_frame_mapper_common",
-  ]
-  deps = []
+  source_set("video_frame_mapper") {
+    defines = [ "MEDIA_GPU_IMPLEMENTATION" ]
+    sources = [
+      "video_frame_mapper_factory.cc",
+    ]
+    public_deps = [
+      ":video_frame_mapper_common",
+    ]
+    deps = []
 
-  # generic_dmabuf_video_frame_mapper
-  if (use_v4l2_codec || use_vaapi) {
-    deps += [ "//media/gpu/linux:video_frame_mapper" ]
-  }
+    # generic_dmabuf_video_frame_mapper
+    if (use_v4l2_codec || use_vaapi) {
+      deps += [ "//media/gpu/linux:video_frame_mapper" ]
+    }
 
-  # vaapi_dmabuf_video_frame_mapper
-  if (use_vaapi) {
-    deps += [ "//media/gpu/vaapi" ]
+    # vaapi_dmabuf_video_frame_mapper
+    if (use_vaapi) {
+      deps += [ "//media/gpu/vaapi" ]
+    }
   }
-}
 
-source_set("video_frame_mapper_common") {
-  defines = [ "MEDIA_GPU_IMPLEMENTATION" ]
-  sources = [
-    "video_frame_mapper.h",
-    "video_frame_mapper_factory.h",
-  ]
+  source_set("video_frame_mapper_common") {
+    defines = [ "MEDIA_GPU_IMPLEMENTATION" ]
+    sources = [
+      "video_frame_mapper.h",
+      "video_frame_mapper_factory.h",
+    ]
 
-  public_deps = [
-    ":buildflags",
-    "//base",
-    "//media",
-  ]
+    public_deps = [
+      ":buildflags",
+      "//base",
+      "//media",
+    ]
+  }
 }
 
 # TODO(watk): Run this on bots. http://crbug.com/461437
@@ -567,6 +572,8 @@ source_set("unit_tests") {
   if (use_v4l2_codec) {
     deps += [ "//media/gpu/v4l2:unit_test" ]
   }
+
+  # TODO(crbug.com/1006266): consider using |use_chromeos_video_acceleration|.
   if (use_v4l2_codec || use_vaapi) {
     sources += [ "vp8_decoder_unittest.cc" ]
   }
@@ -584,57 +591,60 @@ source_set("unit_tests") {
   }
 }
 
-test("video_decode_accelerator_tests") {
-  sources = [
-    "video_decode_accelerator_tests.cc",
-  ]
-  data = [
-    "//media/test/data/",
-  ]
-  deps = [
-    ":buildflags",
-    "test:frame_file_writer",
-    "test:frame_validator",
-    "test:helpers",
-    "test:video_player",
-    "test:video_player_test_environment",
-    "test:video_player_thumbnail_renderer",
-    "//media:test_support",
-    "//testing/gtest",
-  ]
-}
+# TODO(crbug.com/1006266): consider using |use_chromeos_video_acceleration|.
+if (use_v4l2_codec || use_vaapi) {
+  test("video_decode_accelerator_tests") {
+    sources = [
+      "video_decode_accelerator_tests.cc",
+    ]
+    data = [
+      "//media/test/data/",
+    ]
+    deps = [
+      ":buildflags",
+      "test:frame_file_writer",
+      "test:frame_validator",
+      "test:helpers",
+      "test:video_player",
+      "test:video_player_test_environment",
+      "test:video_player_thumbnail_renderer",
+      "//media:test_support",
+      "//testing/gtest",
+    ]
+  }
 
-test("video_decode_accelerator_perf_tests") {
-  sources = [
-    "video_decode_accelerator_perf_tests.cc",
-  ]
-  data = [
-    "//media/test/data/",
-  ]
-  deps = [
-    ":buildflags",
-    "test:video_player",
-    "test:video_player_test_environment",
-    "//media:test_support",
-    "//testing/gtest",
-  ]
-}
+  test("video_decode_accelerator_perf_tests") {
+    sources = [
+      "video_decode_accelerator_perf_tests.cc",
+    ]
+    data = [
+      "//media/test/data/",
+    ]
+    deps = [
+      ":buildflags",
+      "test:video_player",
+      "test:video_player_test_environment",
+      "//media:test_support",
+      "//testing/gtest",
+    ]
+  }
 
-test("image_processor_test") {
-  sources = [
-    "image_processor_test.cc",
-  ]
-  deps = [
-    ":buildflags",
-    ":gpu",
-    "test:frame_file_writer",
-    "test:frame_validator",
-    "test:helpers",
-    "test:image_processor",
-    "test:render_helpers",
-    "//base/test:test_support",
-    "//media:test_support",
-    "//mojo/core/embedder",
-    "//testing/gtest",
-  ]
+  test("image_processor_test") {
+    sources = [
+      "image_processor_test.cc",
+    ]
+    deps = [
+      ":buildflags",
+      ":gpu",
+      "test:frame_file_writer",
+      "test:frame_validator",
+      "test:helpers",
+      "test:image_processor",
+      "test:render_helpers",
+      "//base/test:test_support",
+      "//media:test_support",
+      "//mojo/core/embedder",
+      "//testing/gtest",
+    ]
+  }
 }

media/gpu/chromeos/BUILD.gn

@@ -4,7 +4,8 @@
 
 import("//media/gpu/args.gni")
 
-assert(is_chromeos)
+# TODO(crbug.com/1006266): consider using |use_chromeos_video_acceleration|.
+assert(use_v4l2_codec || use_vaapi)
 
 source_set("chromeos") {
   defines = [ "MEDIA_GPU_IMPLEMENTATION" ]

media/gpu/test/video_frame_file_writer.cc

@@ -109,6 +109,7 @@ void VideoFrameFileWriter::ProcessVideoFrameTask(
   base::SStringPrintf(&filename, FILE_PATH_LITERAL("frame_%04zu_%dx%d"),
                       frame_index, visible_size.width(), visible_size.height());
 
+#if defined(OS_CHROMEOS)
   // Create VideoFrameMapper if not yet created. The decoder's output pixel
   // format is not known yet when creating the VideoFrameWriter. We can only
   // create the VideoFrameMapper upon receiving the first video frame.
@@ -117,6 +118,7 @@ void VideoFrameFileWriter::ProcessVideoFrameTask(
         VideoFrameMapperFactory::CreateMapper(video_frame->format());
     LOG_ASSERT(video_frame_mapper_) << "Failed to create VideoFrameMapper";
   }
+#endif
 
   switch (output_format_) {
     case OutputFormat::kPNG:
@@ -139,7 +141,7 @@ void VideoFrameFileWriter::WriteVideoFramePNG(
   DCHECK(video_frame_mapper_);
 
   auto mapped_frame = video_frame;
-#if defined(OS_LINUX)
+#if defined(OS_CHROMEOS)
   if (video_frame->storage_type() == VideoFrame::STORAGE_DMABUFS)
     mapped_frame = video_frame_mapper_->Map(std::move(video_frame));
 #endif
@@ -181,7 +183,7 @@ void VideoFrameFileWriter::WriteVideoFrameYUV(
   DCHECK(video_frame_mapper_);
 
   auto mapped_frame = video_frame;
-#if defined(OS_LINUX)
+#if defined(OS_CHROMEOS)
   if (video_frame->storage_type() == VideoFrame::STORAGE_DMABUFS)
     mapped_frame = video_frame_mapper_->Map(std::move(video_frame));
 #endif

media/gpu/video_decode_accelerator_unittest.cc

@@ -80,6 +80,7 @@
 #include "base/win/windows_version.h"
 #include "media/gpu/windows/dxva_video_decode_accelerator_win.h"
 #endif  // defined(OS_WIN)
+
 #if BUILDFLAG(USE_VAAPI)
 #include "media/gpu/vaapi/vaapi_wrapper.h"
 #endif  // BUILDFLAG(USE_VAAPI)

media/mojo/services/gpu_mojo_media_client.cc

@@ -155,7 +155,7 @@ GpuMojoMediaClient::GetSupportedVideoDecoderConfigs() {
   supported_config_map[VideoDecoderImplementation::kAlternate] =
       *d3d11_supported_configs_;
 
-#elif defined(OS_CHROMEOS)
+#elif defined(USE_CHROMEOS_MEDIA_ACCELERATION)
   if (base::FeatureList::IsEnabled(kChromeosVideoDecoder)) {
     if (!cros_supported_configs_) {
       cros_supported_configs_ =
@@ -165,7 +165,7 @@ GpuMojoMediaClient::GetSupportedVideoDecoderConfigs() {
         *cros_supported_configs_;
     return supported_config_map;
   }
-#endif  // defined(OS_WIN)
+#endif
 
   auto& default_configs =
       supported_config_map[VideoDecoderImplementation::kDefault];