Commit 7abba046 authored by Matt Falkenhagen's avatar Matt Falkenhagen Committed by Commit Bot

Convert content/public for media to Once/Repeating callbacks.

Bug: 1007763
Change-Id: I9c934d13eb233f42734098d0343bb18f5b53099d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1928390Reviewed-by: default avatarMiguel Casas <mcasas@chromium.org>
Commit-Queue: Matt Falkenhagen <falken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#718944}
parent a698e9b8
...@@ -12,13 +12,14 @@ ...@@ -12,13 +12,14 @@
namespace content { namespace content {
void CreateVideoEncodeAccelerator( void CreateVideoEncodeAccelerator(
const OnCreateVideoEncodeAcceleratorCallback& callback) { OnCreateVideoEncodeAcceleratorCallback callback) {
DCHECK(!callback.is_null()); DCHECK(!callback.is_null());
media::GpuVideoAcceleratorFactories* gpu_factories = media::GpuVideoAcceleratorFactories* gpu_factories =
RenderThreadImpl::current()->GetGpuFactories(); RenderThreadImpl::current()->GetGpuFactories();
if (!gpu_factories || !gpu_factories->IsGpuVideoAcceleratorEnabled()) { if (!gpu_factories || !gpu_factories->IsGpuVideoAcceleratorEnabled()) {
callback.Run(nullptr, std::unique_ptr<media::VideoEncodeAccelerator>()); std::move(callback).Run(nullptr,
std::unique_ptr<media::VideoEncodeAccelerator>());
return; return;
} }
...@@ -26,10 +27,10 @@ void CreateVideoEncodeAccelerator( ...@@ -26,10 +27,10 @@ void CreateVideoEncodeAccelerator(
gpu_factories->GetTaskRunner(); gpu_factories->GetTaskRunner();
base::PostTaskAndReplyWithResult( base::PostTaskAndReplyWithResult(
encode_task_runner.get(), FROM_HERE, encode_task_runner.get(), FROM_HERE,
base::Bind( base::BindOnce(
&media::GpuVideoAcceleratorFactories::CreateVideoEncodeAccelerator, &media::GpuVideoAcceleratorFactories::CreateVideoEncodeAccelerator,
base::Unretained(gpu_factories)), base::Unretained(gpu_factories)),
base::Bind(callback, encode_task_runner)); base::BindOnce(std::move(callback), encode_task_runner));
} }
media::VideoEncodeAccelerator::SupportedProfiles media::VideoEncodeAccelerator::SupportedProfiles
......
...@@ -17,15 +17,14 @@ namespace content { ...@@ -17,15 +17,14 @@ namespace content {
// Called when CreateVideoEncodeAccelerator request is complete. // Called when CreateVideoEncodeAccelerator request is complete.
// The |vea| object must be accessed on the thread associated with the // The |vea| object must be accessed on the thread associated with the
// |encode_task_runner|. // |encode_task_runner|.
typedef base::Callback<void( typedef base::OnceCallback<void(
scoped_refptr<base::SingleThreadTaskRunner> encoder_task_runner, scoped_refptr<base::SingleThreadTaskRunner> encoder_task_runner,
std::unique_ptr<media::VideoEncodeAccelerator> vea)> std::unique_ptr<media::VideoEncodeAccelerator> vea)>
OnCreateVideoEncodeAcceleratorCallback; OnCreateVideoEncodeAcceleratorCallback;
// Generates an instance of media::VideoEncodeAccelerator. // Generates an instance of media::VideoEncodeAccelerator.
CONTENT_EXPORT void CONTENT_EXPORT void CreateVideoEncodeAccelerator(
CreateVideoEncodeAccelerator( OnCreateVideoEncodeAcceleratorCallback callback);
const OnCreateVideoEncodeAcceleratorCallback& callback);
// Returns list of encoding profiles supported by VideoEncodeAccelerator. // Returns list of encoding profiles supported by VideoEncodeAccelerator.
CONTENT_EXPORT media::VideoEncodeAccelerator::SupportedProfiles CONTENT_EXPORT media::VideoEncodeAccelerator::SupportedProfiles
......
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