Commit 97f084d3 authored by Dale Curtis's avatar Dale Curtis Committed by Commit Bot

Enable hardware encoding on macOS and Linux.

macOS requires a larger initial size for the encoding test to
actually succeed. Linux normally doesn't have any hardware
encoding support, but it may be enabled with a chrome://flag.

R=eugene

Fixed: 1110279
Change-Id: I05feac9fee3bb2aa76bb5e14f06b48c6b8b46a1f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2537145Reviewed-by: default avatarEugene Zemtsov <eugene@chromium.org>
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827910}
parent 3b97d48c
...@@ -56,11 +56,6 @@ namespace { ...@@ -56,11 +56,6 @@ namespace {
std::unique_ptr<media::VideoEncoder> CreateAcceleratedVideoEncoder( std::unique_ptr<media::VideoEncoder> CreateAcceleratedVideoEncoder(
media::VideoCodecProfile profile, media::VideoCodecProfile profile,
const media::VideoEncoder::Options& options) { const media::VideoEncoder::Options& options) {
#if defined(OS_MAC) || defined(OS_LINUX)
// TODO(https://crbug.com/1110279) Flush() is not implemented on MacOS'
// accelerated video encoder, so we can't use it yet.
return nullptr;
#else
auto* gpu_factories = Platform::Current()->GetGpuFactories(); auto* gpu_factories = Platform::Current()->GetGpuFactories();
if (!gpu_factories || !gpu_factories->IsGpuVideoAcceleratorEnabled()) if (!gpu_factories || !gpu_factories->IsGpuVideoAcceleratorEnabled())
return nullptr; return nullptr;
...@@ -101,7 +96,6 @@ std::unique_ptr<media::VideoEncoder> CreateAcceleratedVideoEncoder( ...@@ -101,7 +96,6 @@ std::unique_ptr<media::VideoEncoder> CreateAcceleratedVideoEncoder(
media::AsyncDestroyVideoEncoder<media::VideoEncodeAcceleratorAdapter>>( media::AsyncDestroyVideoEncoder<media::VideoEncodeAcceleratorAdapter>>(
std::make_unique<media::VideoEncodeAcceleratorAdapter>( std::make_unique<media::VideoEncodeAcceleratorAdapter>(
gpu_factories, std::move(task_runner))); gpu_factories, std::move(task_runner)));
#endif // defined(OS_MAC) || defined(OS_LINUX)
} }
std::unique_ptr<media::VideoEncoder> CreateVpxVideoEncoder() { std::unique_ptr<media::VideoEncoder> CreateVpxVideoEncoder() {
......
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
}; };
async function encode_decode_test(codec, acc) { async function encode_decode_test(codec, acc) {
const w = 120; const w = 640;
const h = 60; const h = 360;
let next_ts = 0 let next_ts = 0
let frames_to_encode = 16; let frames_to_encode = 16;
let frames_encoded = 0; let frames_encoded = 0;
...@@ -109,8 +109,8 @@ ...@@ -109,8 +109,8 @@
} }
async function encode_test(codec, acc) { async function encode_test(codec, acc) {
let w = 120; let w = 640;
let h = 60; let h = 360;
let next_ts = 0 let next_ts = 0
let frames_to_encode = 16; let frames_to_encode = 16;
let frames_processed = 0; let frames_processed = 0;
......
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