media/gpu: Move VideoFrameConverter related files into //media/gpu/chromeos.

Currently only ChromeOS platform uses VideoFrameConverter. This CL
moves the related files to //media/gpu/chromeos.

BUG=chromium:1012587
TEST=gn check on kevin and eve
TEST=ninja chrome on kevin and eve
TEST=ninja media_unittests

Change-Id: I73334bec4b9eee812c3b4c88f3a0230b5a003cd9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1877493
Commit-Queue: Chih-Yu Huang <akahuang@chromium.org>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
Reviewed-by: Shuo-Peng Liao <deanliao@chromium.org>
Reviewed-by: Dan Sanders <sandersd@chromium.org>
Reviewed-by: Miguel Casas <mcasas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709394}

media/gpu/BUILD.gn

@@ -256,8 +256,6 @@ source_set("common") {
     "h264_dpb.cc",
     "h264_dpb.h",
     "macros.h",
-    "video_frame_converter.cc",
-    "video_frame_converter.h",
     "vp9_decoder.cc",
     "vp9_decoder.h",
     "vp9_picture.cc",

media/gpu/chromeos/BUILD.gn

@@ -51,8 +51,12 @@ source_set("common") {
     "image_processor_factory.h",
     "libyuv_image_processor.cc",
     "libyuv_image_processor.h",
+    "mailbox_video_frame_converter.cc",
+    "mailbox_video_frame_converter.h",
     "video_decoder_pipeline.cc",
     "video_decoder_pipeline.h",
+    "video_frame_converter.cc",
+    "video_frame_converter.h",
   ]
 
   # TODO(crbug.com/1012587): Merge :fourcc to :common.
@@ -65,6 +69,7 @@ source_set("common") {
     "//base",
     "//media",
     "//media/gpu:buildflags",
+    "//media/gpu:command_buffer_helper",
     "//media/gpu:common",
     "//media/gpu:video_frame_mapper_common",
     "//media/gpu/linux:common",
@@ -94,13 +99,17 @@ source_set("fourcc") {
 source_set("unit_tests") {
   testonly = true
   deps = [
-    ":fourcc",
+    ":common",
     "//base",
+    "//base/test:test_support",
     "//media/gpu:buildflags",
+    "//skia",
+    "//testing/gmock",
     "//testing/gtest",
   ]
   sources = [
     "fourcc_unittests.cc",
+    "mailbox_video_frame_converter_unittest.cc",
   ]
 }
 

media/gpu/chromeos/chromeos_video_decoder_factory.cc

@@ -11,8 +11,8 @@
 #include "media/gpu/buildflags.h"
 
 #if BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
+#include "media/gpu/chromeos/mailbox_video_frame_converter.h"
 #include "media/gpu/chromeos/video_decoder_pipeline.h"
-#include "media/gpu/linux/mailbox_video_frame_converter.h"
 #include "media/gpu/linux/platform_video_frame_pool.h"
 #endif  // BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
 

media/gpu/linux/mailbox_video_frame_converter.cc → media/gpu/chromeos/mailbox_video_frame_converter.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/gpu/linux/mailbox_video_frame_converter.h"
+#include "media/gpu/chromeos/mailbox_video_frame_converter.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"

media/gpu/linux/mailbox_video_frame_converter.h → media/gpu/chromeos/mailbox_video_frame_converter.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_GPU_LINUX_MAILBOX_VIDEO_FRAME_CONVERTER_H_
-#define MEDIA_GPU_LINUX_MAILBOX_VIDEO_FRAME_CONVERTER_H_
+#ifndef MEDIA_GPU_CHROMEOS_MAILBOX_VIDEO_FRAME_CONVERTER_H_
+#define MEDIA_GPU_CHROMEOS_MAILBOX_VIDEO_FRAME_CONVERTER_H_
 
 #include "base/callback_forward.h"
 #include "base/containers/queue.h"
@@ -11,8 +11,8 @@
 #include "base/memory/scoped_refptr.h"
 #include "base/memory/weak_ptr.h"
 #include "gpu/command_buffer/common/mailbox.h"
+#include "media/gpu/chromeos/video_frame_converter.h"
 #include "media/gpu/media_gpu_export.h"
-#include "media/gpu/video_frame_converter.h"
 
 namespace base {
 class Location;
@@ -164,4 +164,4 @@ class MEDIA_GPU_EXPORT MailboxVideoFrameConverter : public VideoFrameConverter {
 };
 
 }  // namespace media
-#endif  // MEDIA_GPU_LINUX_MAILBOX_VIDEO_FRAME_CONVERTER_H_
+#endif  // MEDIA_GPU_CHROMEOS_MAILBOX_VIDEO_FRAME_CONVERTER_H_

media/gpu/linux/mailbox_video_frame_converter_unittest.cc → media/gpu/chromeos/mailbox_video_frame_converter_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/gpu/linux/mailbox_video_frame_converter.h"
+#include "media/gpu/chromeos/mailbox_video_frame_converter.h"
 
 #include "base/bind.h"
 #include "base/test/task_environment.h"

media/gpu/chromeos/video_decoder_pipeline.h

@@ -13,8 +13,8 @@
 #include "base/sequence_checker.h"
 #include "media/base/video_decoder.h"
 #include "media/base/video_decoder_config.h"
+#include "media/gpu/chromeos/video_frame_converter.h"
 #include "media/gpu/media_gpu_export.h"
-#include "media/gpu/video_frame_converter.h"
 
 namespace base {
 class SequencedTaskRunner;

media/gpu/video_frame_converter.cc → media/gpu/chromeos/video_frame_converter.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/gpu/video_frame_converter.h"
+#include "media/gpu/chromeos/video_frame_converter.h"
 
 namespace media {
 

media/gpu/video_frame_converter.h → media/gpu/chromeos/video_frame_converter.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_GPU_VIDEO_FRAME_CONVERTER_H_
-#define MEDIA_GPU_VIDEO_FRAME_CONVERTER_H_
+#ifndef MEDIA_GPU_CHROMEOS_VIDEO_FRAME_CONVERTER_H_
+#define MEDIA_GPU_CHROMEOS_VIDEO_FRAME_CONVERTER_H_
 
 #include <memory>
 
@@ -76,4 +76,4 @@ struct MEDIA_GPU_EXPORT default_delete<media::VideoFrameConverter> {
 
 }  // namespace std
 
-#endif  // MEDIA_GPU_VIDEO_FRAME_CONVERTER_H_
+#endif  // MEDIA_GPU_CHROMEOS_VIDEO_FRAME_CONVERTER_H_

media/gpu/linux/BUILD.gn

@@ -12,8 +12,6 @@ source_set("common") {
   sources = [
     "dmabuf_video_frame_pool.cc",
     "dmabuf_video_frame_pool.h",
-    "mailbox_video_frame_converter.cc",
-    "mailbox_video_frame_converter.h",
     "platform_video_frame_pool.cc",
     "platform_video_frame_pool.h",
     "platform_video_frame_utils.cc",
@@ -57,7 +55,6 @@ source_set("video_frame_mapper") {
 source_set("unit_tests") {
   testonly = true
   sources = [
-    "mailbox_video_frame_converter_unittest.cc",
     "platform_video_frame_pool_unittest.cc",
     "platform_video_frame_utils_unittest.cc",
   ]
@@ -67,7 +64,6 @@ source_set("unit_tests") {
     "//base/test:test_support",
     "//media",
     "//media/gpu:common",
-    "//skia",
     "//testing/gmock",
     "//testing/gtest",
     "//ui/gfx:memory_buffer",

media/gpu/test/video_player/video_decoder_client.cc

@@ -25,7 +25,7 @@
 
 #if defined(OS_CHROMEOS)
 #include "media/gpu/chromeos/chromeos_video_decoder_factory.h"
-#include "media/gpu/video_frame_converter.h"
+#include "media/gpu/chromeos/video_frame_converter.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace media {

media/mojo/services/gpu_mojo_media_client.cc

@@ -49,7 +49,7 @@
 #if defined(OS_CHROMEOS)
 #include "media/gpu/chromeos/chromeos_video_decoder_factory.h"
 #if BUILDFLAG(USE_V4L2_CODEC) || BUILDFLAG(USE_VAAPI)
-#include "media/gpu/linux/mailbox_video_frame_converter.h"
+#include "media/gpu/chromeos/mailbox_video_frame_converter.h"
 #include "media/gpu/linux/platform_video_frame_pool.h"
 #endif  // BUILDFLAG(USE_V4L2_CODEC) || BUILDFLAG(USE_VAAPI)
 #endif  // defined(OS_CHROMEOS)