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

This reverts commit ad602416.

Reason for revert: Compile breaks: https://ci.chromium.org/p/chromium/builders/ci/ChromiumOS%20ASAN%20Release/104250

Original change's description:
> media/gpu/BUILD.gn: restrict image_processor, video_frame_mapper to CrOs, Chromecast
> 
> 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.
> 
> Change-Id: I8098d55859c50a752b40a63955684e558db3582a
> 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-Commit-Position: refs/heads/master@{#698566}

TBR=deanliao@chromium.org,mcasas@chromium.org,akahuang@chromium.org,hiroh@chromium.org,acourbot@chromium.org,yucliu@chromium.org,dstaessens@chromium.org

Change-Id: I1f70a99e52b6ca640e4f8c9fcc79ba71dbb7f5f0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1816972Reviewed-by: Nate Chapin <japhet@chromium.org>
Commit-Queue: Nate Chapin <japhet@chromium.org>
Cr-Commit-Position: refs/heads/master@{#698595}

media/gpu/BUILD.gn

@@ -65,6 +65,8 @@ component("gpu") {
     ":buildflags",
     ":command_buffer_helper",
     ":common",
+    ":image_processor",
+    ":video_frame_mapper",
     "//base",
     "//gpu",
     "//media",
@@ -81,14 +83,12 @@ component("gpu") {
   libs = []
   ldflags = []
 
-  # TODO(crbug.com/1006266): consider using |use_chromeos_video_acceleration|.
   if (use_v4l2_codec || use_vaapi) {
-    public_deps += [
-      ":image_processor",
-      ":video_frame_mapper",
-      "//media/gpu/chromeos",
-      "//media/gpu/linux:common",
-    ]
+    public_deps += [ "//media/gpu/linux:common" ]
+  }
+
+  if (is_chromeos) {
+    public_deps += [ "//media/gpu/chromeos" ]
   }
 
   if (is_mac) {
@@ -260,8 +260,6 @@ 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",
@@ -305,9 +303,7 @@ source_set("command_buffer_helper") {
   ]
 }
 
-# TODO(crbug.com/1006266): consider using |use_chromeos_video_acceleration|.
-if (use_v4l2_codec || use_vaapi) {
-  source_set("image_processor") {
+source_set("image_processor") {
   defines = [ "MEDIA_GPU_IMPLEMENTATION" ]
   sources = [
     "image_processor_factory.cc",
@@ -328,9 +324,9 @@ if (use_v4l2_codec || use_vaapi) {
   if (use_v4l2_codec) {
     deps += [ "//media/gpu/v4l2" ]
   }
-  }
+}
 
-  source_set("image_processor_common") {
+source_set("image_processor_common") {
   defines = [ "MEDIA_GPU_IMPLEMENTATION" ]
   sources = [
     "image_processor.cc",
@@ -345,9 +341,9 @@ if (use_v4l2_codec || use_vaapi) {
     "//media",
     "//ui/gfx/geometry",
   ]
-  }
+}
 
-  source_set("video_frame_mapper") {
+source_set("video_frame_mapper") {
   defines = [ "MEDIA_GPU_IMPLEMENTATION" ]
   sources = [
     "video_frame_mapper_factory.cc",
@@ -366,9 +362,9 @@ if (use_v4l2_codec || use_vaapi) {
   if (use_vaapi) {
     deps += [ "//media/gpu/vaapi" ]
   }
-  }
+}
 
-  source_set("video_frame_mapper_common") {
+source_set("video_frame_mapper_common") {
   defines = [ "MEDIA_GPU_IMPLEMENTATION" ]
   sources = [
     "video_frame_mapper.h",
@@ -380,7 +376,6 @@ if (use_v4l2_codec || use_vaapi) {
     "//base",
     "//media",
   ]
-  }
 }
 
 # TODO(watk): Run this on bots. http://crbug.com/461437
@@ -572,8 +567,6 @@ 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" ]
   }
@@ -591,9 +584,7 @@ source_set("unit_tests") {
   }
 }
 
-# TODO(crbug.com/1006266): consider using |use_chromeos_video_acceleration|.
-if (use_v4l2_codec || use_vaapi) {
-  test("video_decode_accelerator_tests") {
+test("video_decode_accelerator_tests") {
   sources = [
     "video_decode_accelerator_tests.cc",
   ]
@@ -611,9 +602,9 @@ if (use_v4l2_codec || use_vaapi) {
     "//media:test_support",
     "//testing/gtest",
   ]
-  }
+}
 
-  test("video_decode_accelerator_perf_tests") {
+test("video_decode_accelerator_perf_tests") {
   sources = [
     "video_decode_accelerator_perf_tests.cc",
   ]
@@ -627,9 +618,9 @@ if (use_v4l2_codec || use_vaapi) {
     "//media:test_support",
     "//testing/gtest",
   ]
-  }
+}
 
-  test("image_processor_test") {
+test("image_processor_test") {
   sources = [
     "image_processor_test.cc",
   ]
@@ -646,5 +637,4 @@ if (use_v4l2_codec || use_vaapi) {
     "//mojo/core/embedder",
     "//testing/gtest",
   ]
-  }
 }

media/gpu/chromeos/BUILD.gn

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

media/gpu/test/video_frame_file_writer.cc

@@ -109,7 +109,6 @@ 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.
@@ -118,7 +117,6 @@ void VideoFrameFileWriter::ProcessVideoFrameTask(
         VideoFrameMapperFactory::CreateMapper(video_frame->format());
     LOG_ASSERT(video_frame_mapper_) << "Failed to create VideoFrameMapper";
   }
-#endif
 
   switch (output_format_) {
     case OutputFormat::kPNG:
@@ -141,7 +139,7 @@ void VideoFrameFileWriter::WriteVideoFramePNG(
   DCHECK(video_frame_mapper_);
 
   auto mapped_frame = video_frame;
-#if defined(OS_CHROMEOS)
+#if defined(OS_LINUX)
   if (video_frame->storage_type() == VideoFrame::STORAGE_DMABUFS)
     mapped_frame = video_frame_mapper_->Map(std::move(video_frame));
 #endif
@@ -183,7 +181,7 @@ void VideoFrameFileWriter::WriteVideoFrameYUV(
   DCHECK(video_frame_mapper_);
 
   auto mapped_frame = video_frame;
-#if defined(OS_CHROMEOS)
+#if defined(OS_LINUX)
   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,7 +80,6 @@
 #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)