| Index: chrome/gpu/arc_gpu_video_decode_accelerator.cc
|
| diff --git a/chrome/gpu/arc_gpu_video_decode_accelerator.cc b/chrome/gpu/arc_gpu_video_decode_accelerator.cc
|
| index 9abb435ca1864da71dce12c8a67a33011fb7dea8..4da3c6f52ba3e7f7c47a8ab93d73ef6a468a8c9c 100644
|
| --- a/chrome/gpu/arc_gpu_video_decode_accelerator.cc
|
| +++ b/chrome/gpu/arc_gpu_video_decode_accelerator.cc
|
| @@ -69,9 +69,9 @@ ArcGpuVideoDecodeAccelerator::~ArcGpuVideoDecodeAccelerator() {
|
| }
|
| }
|
|
|
| -ArcVideoAccelerator::Result ArcGpuVideoDecodeAccelerator::Initialize(
|
| +ArcVideoDecodeAccelerator::Result ArcGpuVideoDecodeAccelerator::Initialize(
|
| const Config& config,
|
| - ArcVideoAccelerator::Client* client) {
|
| + ArcVideoDecodeAccelerator::Client* client) {
|
| auto result = InitializeTask(config, client);
|
| // Report initialization status to UMA.
|
| UMA_HISTOGRAM_ENUMERATION(
|
| @@ -80,15 +80,12 @@ ArcVideoAccelerator::Result ArcGpuVideoDecodeAccelerator::Initialize(
|
| return result;
|
| }
|
|
|
| -ArcVideoAccelerator::Result ArcGpuVideoDecodeAccelerator::InitializeTask(
|
| +ArcVideoDecodeAccelerator::Result ArcGpuVideoDecodeAccelerator::InitializeTask(
|
| const Config& config,
|
| - ArcVideoAccelerator::Client* client) {
|
| - DVLOG(5) << "Initialize(device=" << config.device_type
|
| - << ", input_pixel_format=" << config.input_pixel_format
|
| + ArcVideoDecodeAccelerator::Client* client) {
|
| + DVLOG(5) << "Initialize(input_pixel_format=" << config.input_pixel_format
|
| << ", num_input_buffers=" << config.num_input_buffers << ")";
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| - if (config.device_type != Config::DEVICE_DECODER)
|
| - return INVALID_ARGUMENT;
|
| DCHECK(client);
|
|
|
| if (arc_client_) {
|
| @@ -137,7 +134,7 @@ ArcVideoAccelerator::Result ArcGpuVideoDecodeAccelerator::InitializeTask(
|
| }
|
|
|
| client_count_++;
|
| - DVLOG(5) << "Number of concurrent ArcVideoAccelerator clients: "
|
| + DVLOG(5) << "Number of concurrent ArcVideoDecodeAccelerator clients: "
|
| << client_count_;
|
|
|
| return SUCCESS;
|
| @@ -465,20 +462,20 @@ void ArcGpuVideoDecodeAccelerator::NotifyResetDone() {
|
| arc_client_->OnResetDone();
|
| }
|
|
|
| -static ArcVideoAccelerator::Result ConvertErrorCode(
|
| +static ArcVideoDecodeAccelerator::Result ConvertErrorCode(
|
| media::VideoDecodeAccelerator::Error error) {
|
| switch (error) {
|
| case media::VideoDecodeAccelerator::ILLEGAL_STATE:
|
| - return ArcVideoAccelerator::ILLEGAL_STATE;
|
| + return ArcVideoDecodeAccelerator::ILLEGAL_STATE;
|
| case media::VideoDecodeAccelerator::INVALID_ARGUMENT:
|
| - return ArcVideoAccelerator::INVALID_ARGUMENT;
|
| + return ArcVideoDecodeAccelerator::INVALID_ARGUMENT;
|
| case media::VideoDecodeAccelerator::UNREADABLE_INPUT:
|
| - return ArcVideoAccelerator::UNREADABLE_INPUT;
|
| + return ArcVideoDecodeAccelerator::UNREADABLE_INPUT;
|
| case media::VideoDecodeAccelerator::PLATFORM_FAILURE:
|
| - return ArcVideoAccelerator::PLATFORM_FAILURE;
|
| + return ArcVideoDecodeAccelerator::PLATFORM_FAILURE;
|
| default:
|
| DLOG(ERROR) << "Unknown error: " << error;
|
| - return ArcVideoAccelerator::PLATFORM_FAILURE;
|
| + return ArcVideoDecodeAccelerator::PLATFORM_FAILURE;
|
| }
|
| }
|
|
|
|
|