Remove content::GpuVideoDecodeAcceleratorFactory

chrome/gpu/arc_gpu_video_decode_accelerator.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/gpu/arc_gpu_video_decode_accelerator.h"
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/numerics/safe_math.h"
 #include "base/run_loop.h"
-#include "content/public/gpu/gpu_video_decode_accelerator_factory.h"
 #include "media/base/video_frame.h"
+#include "media/gpu/gpu_video_decode_accelerator_factory_impl.h"
 
 namespace chromeos {
 namespace arc {
 
 namespace {
 
 // An arbitrary chosen limit of the number of buffers. The number of
 // buffers used is requested from the untrusted client side.
 const size_t kMaxBufferCount = 128;
 
@@ skipping 21 matching lines @@
 
 ArcGpuVideoDecodeAccelerator::InputBufferInfo::~InputBufferInfo() = default;
 
 ArcGpuVideoDecodeAccelerator::OutputBufferInfo::OutputBufferInfo() = default;
 
 ArcGpuVideoDecodeAccelerator::OutputBufferInfo::OutputBufferInfo(
     OutputBufferInfo&& other) = default;
 
 ArcGpuVideoDecodeAccelerator::OutputBufferInfo::~OutputBufferInfo() = default;
 
-ArcGpuVideoDecodeAccelerator::ArcGpuVideoDecodeAccelerator()
+ArcGpuVideoDecodeAccelerator::ArcGpuVideoDecodeAccelerator(
+    const gpu::GpuPreferences& gpu_preferences)
     : arc_client_(nullptr),
       next_bitstream_buffer_id_(0),
       output_pixel_format_(media::PIXEL_FORMAT_UNKNOWN),
-      output_buffer_size_(0) {}
+      output_buffer_size_(0),
+      gpu_preferences_(gpu_preferences) {}
 
 ArcGpuVideoDecodeAccelerator::~ArcGpuVideoDecodeAccelerator() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (vda_) {
     client_count_--;
   }
 }
 
 ArcVideoAccelerator::Result ArcGpuVideoDecodeAccelerator::Initialize(
     const Config& config,
@@ skipping 33 matching lines @@
     case HAL_PIXEL_FORMAT_VP8:
       vda_config.profile = media::VP8PROFILE_ANY;
       break;
     default:
       DLOG(ERROR) << "Unsupported input format: " << config.input_pixel_format;
       return INVALID_ARGUMENT;
   }
   vda_config.output_mode =
       media::VideoDecodeAccelerator::Config::OutputMode::IMPORT;
 
-  std::unique_ptr<content::GpuVideoDecodeAcceleratorFactory> vda_factory =
-      content::GpuVideoDecodeAcceleratorFactory::CreateWithNoGL();
-  vda_ = vda_factory->CreateVDA(this, vda_config);
+  auto vda_factory =
+      media::GpuVideoDecodeAcceleratorFactoryImpl::CreateWithNoGL();
+  vda_ = vda_factory->CreateVDA(
+      this, vda_config, gpu::GpuDriverBugWorkarounds(), gpu_preferences_);
   if (!vda_) {
     DLOG(ERROR) << "Failed to create VDA.";
     return PLATFORM_FAILURE;
   }
 
   client_count_++;
   DVLOG(5) << "Number of concurrent ArcVideoAccelerator clients: "
            << client_count_;
 
   return SUCCESS;
@@ skipping 366 matching lines @@
       }
       return true;
     default:
       DLOG(ERROR) << "Invalid port: " << port;
       return false;
   }
 }
 
 }  // namespace arc
 }  // namespace chromeos