Commit 2c68ddb9 authored by Chih-Yu Huang's avatar Chih-Yu Huang Committed by Commit Bot

media/gpu/chromeos: Remove USE_CHROMEOS_MEDIA_ACCELERATION in code.

in BUILD.gn, we already restrict all code in media/gpu/chromeos are
only compiled when USE_V4L2_CODEC or USE_VAAPI is true. We don't need
this buildflag in the source code.

Bug: none
Test: Run video_decode_accelerator_tests on Kevin and Eve
Change-Id: I5449101ca5ae6702d10f4b3bfc233f27d2767aa7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1900786Reviewed-by: default avatarHirokazu Honda <hiroh@chromium.org>
Commit-Queue: Chih-Yu Huang <akahuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712920}
parent 71cebab1
......@@ -9,12 +9,9 @@
#include "base/sequenced_task_runner.h"
#include "media/base/video_decoder.h"
#include "media/gpu/buildflags.h"
#if BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
#include "media/gpu/chromeos/mailbox_video_frame_converter.h"
#include "media/gpu/chromeos/platform_video_frame_pool.h"
#include "media/gpu/chromeos/video_decoder_pipeline.h"
#endif // BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
#if BUILDFLAG(USE_VAAPI)
#include "media/gpu/vaapi/vaapi_video_decoder.h"
......@@ -28,7 +25,6 @@ namespace media {
namespace {
#if BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
// Get a list of the available functions for creating VideoDeocoder.
base::queue<VideoDecoderPipeline::CreateVDFunc> GetCreateVDFunctions(
VideoDecoderPipeline::CreateVDFunc cur_create_vd_func) {
......@@ -49,7 +45,6 @@ base::queue<VideoDecoderPipeline::CreateVDFunc> GetCreateVDFunctions(
}
return ret;
}
#endif // BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
} // namespace
......@@ -80,14 +75,10 @@ std::unique_ptr<VideoDecoder> ChromeosVideoDecoderFactory::Create(
std::unique_ptr<DmabufVideoFramePool> frame_pool,
std::unique_ptr<VideoFrameConverter> frame_converter,
gpu::GpuMemoryBufferFactory* const gpu_memory_buffer_factory) {
#if BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
return VideoDecoderPipeline::Create(
std::move(client_task_runner), std::move(frame_pool),
std::move(frame_converter), gpu_memory_buffer_factory,
base::BindRepeating(&GetCreateVDFunctions));
#endif // BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
return nullptr;
}
} // namespace media
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