Commit 89de1b10 authored by Chih-Yu Huang's avatar Chih-Yu Huang Committed by Commit Bot

media/gpu: Move VideoDecoderPipeline into //media/gpu/chromeos.

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

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

Change-Id: Ic2b22535981803e0f425d98fcb220a3e62f57b5f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1877494
Commit-Queue: Chih-Yu Huang <akahuang@chromium.org>
Reviewed-by: default avatarShuo-Peng Liao <deanliao@chromium.org>
Reviewed-by: default avatarDan Sanders <sandersd@chromium.org>
Reviewed-by: default avatarMiguel Casas <mcasas@chromium.org>
Reviewed-by: default avatarDavid Staessens <dstaessens@chromium.org>
Reviewed-by: default avatarHirokazu Honda <hiroh@chromium.org>
Reviewed-by: default avatarAlexandre Courbot <acourbot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709375}
parent d64b780e
......@@ -51,6 +51,8 @@ source_set("common") {
"image_processor_factory.h",
"libyuv_image_processor.cc",
"libyuv_image_processor.h",
"video_decoder_pipeline.cc",
"video_decoder_pipeline.h",
]
# TODO(crbug.com/1012587): Merge :fourcc to :common.
......@@ -65,6 +67,7 @@ source_set("common") {
"//media/gpu:buildflags",
"//media/gpu:common",
"//media/gpu:video_frame_mapper_common",
"//media/gpu/linux:common",
"//third_party/libyuv",
"//ui/gfx/geometry",
"//ui/gl",
......
......@@ -11,9 +11,9 @@
#include "media/gpu/buildflags.h"
#if BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
#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"
#include "media/gpu/linux/video_decoder_pipeline.h"
#endif // BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
#if BUILDFLAG(USE_VAAPI)
......
......@@ -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/video_decoder_pipeline.h"
#include "media/gpu/chromeos/video_decoder_pipeline.h"
#include <memory>
#include "base/bind.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_VIDEO_DECODER_PIPELINE_H_
#define MEDIA_GPU_LINUX_VIDEO_DECODER_PIPELINE_H_
#ifndef MEDIA_GPU_CHROMEOS_VIDEO_DECODER_PIPELINE_H_
#define MEDIA_GPU_CHROMEOS_VIDEO_DECODER_PIPELINE_H_
#include <memory>
......@@ -216,4 +216,4 @@ class MEDIA_GPU_EXPORT VideoDecoderPipeline : public VideoDecoder {
} // namespace media
#endif // MEDIA_GPU_LINUX_VIDEO_DECODER_PIPELINE_H_
#endif // MEDIA_GPU_CHROMEOS_VIDEO_DECODER_PIPELINE_H_
......@@ -18,8 +18,6 @@ source_set("common") {
"platform_video_frame_pool.h",
"platform_video_frame_utils.cc",
"platform_video_frame_utils.h",
"video_decoder_pipeline.cc",
"video_decoder_pipeline.h",
]
deps = [
......
......@@ -25,7 +25,7 @@
#include "base/time/time.h"
#include "media/base/video_frame_layout.h"
#include "media/base/video_types.h"
#include "media/gpu/linux/video_decoder_pipeline.h"
#include "media/gpu/chromeos/video_decoder_pipeline.h"
#include "media/gpu/media_gpu_export.h"
#include "media/gpu/v4l2/v4l2_device.h"
#include "media/gpu/v4l2/v4l2_video_decoder_backend.h"
......
......@@ -24,8 +24,8 @@
#include "base/time/time.h"
#include "media/base/video_codecs.h"
#include "media/base/video_frame_layout.h"
#include "media/gpu/chromeos/video_decoder_pipeline.h"
#include "media/gpu/decode_surface_handler.h"
#include "media/gpu/linux/video_decoder_pipeline.h"
#include "media/video/supported_video_decoder_config.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment