diff options
| author | dcheng <dcheng@chromium.org> | 2014-12-20 10:51:11 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-20 18:51:47 +0000 |
| commit | 6dc14e495d4ca089c096ba0263fd5269647de838 (patch) | |
| tree | bb317610ec2f9a4f1ab78beb736a31b3ac5c6774 /content/common/gpu/media/gpu_video_encode_accelerator.cc | |
| parent | 289e96375e75be0d9158b86df2bd4faf2d7b2a64 (diff) | |
| download | chromium_src-6dc14e495d4ca089c096ba0263fd5269647de838.zip chromium_src-6dc14e495d4ca089c096ba0263fd5269647de838.tar.gz chromium_src-6dc14e495d4ca089c096ba0263fd5269647de838.tar.bz2 | |
Revert of Refactor Vaapi video decoder/encoder in preparation of Freon support (patchset #6 id:100001 of https://codereview.chromium.org/807853005/)
Reason for revert:
Caused build failure on Linux ChromiumOS GN:
ninja: error: '../../content/common/content/common/gpu/media/va_x11.sigs',
needed by 'obj/content/common/libva_generate_stubs.inputdeps.stamp', missing
and no known rule to make it
Original issue's description:
> Refactor Vaapi video decoder/encoder in preparation of Freon support
>
> This introduces VaapiPicture which abstracts the output picture for the VaapiVideoDecodeAccelerator.
> This also splits out the x11 specific functions of LibVA into their own signature file.
> And finally this adds back GLImageGLX to match the code path that will be used on Freon, using GLImageLinuxDMABuffer.
>
> BUG=403058
> TEST=video_decode_accelerator_unittest and video_encode_accelerator_unittest
>
> Committed: https://crrev.com/289e96375e75be0d9158b86df2bd4faf2d7b2a64
> Cr-Commit-Position: refs/heads/master@{#309355}
TBR=reveman@chromium.org,posciak@chromium.org,scherkus@chromium.org,piman@chromium.org,lionel.g.landwerlin@intel.com
NOTREECHECKS=true
NOTRY=true
BUG=403058
Review URL: https://codereview.chromium.org/804353003
Cr-Commit-Position: refs/heads/master@{#309356}
Diffstat (limited to 'content/common/gpu/media/gpu_video_encode_accelerator.cc')
| -rw-r--r-- | content/common/gpu/media/gpu_video_encode_accelerator.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/content/common/gpu/media/gpu_video_encode_accelerator.cc b/content/common/gpu/media/gpu_video_encode_accelerator.cc index 639d1d8..12b473f 100644 --- a/content/common/gpu/media/gpu_video_encode_accelerator.cc +++ b/content/common/gpu/media/gpu_video_encode_accelerator.cc @@ -17,12 +17,13 @@ #include "media/base/limits.h" #include "media/base/video_frame.h" -#if defined(OS_CHROMEOS) +#if defined(OS_CHROMEOS) && defined(USE_X11) -#if defined(ARCH_CPU_ARMEL) && defined(USE_X11) +#if defined(ARCH_CPU_ARMEL) #include "content/common/gpu/media/v4l2_video_encode_accelerator.h" #elif defined(ARCH_CPU_X86_FAMILY) #include "content/common/gpu/media/vaapi_video_encode_accelerator.h" +#include "ui/gfx/x/x11_types.h" #endif #elif defined(OS_ANDROID) && defined(ENABLE_WEBRTC) @@ -190,15 +191,15 @@ GpuVideoEncodeAccelerator::ConvertMediaToGpuProfiles(const std::vector< scoped_ptr<media::VideoEncodeAccelerator> GpuVideoEncodeAccelerator::CreateEncoder() { scoped_ptr<media::VideoEncodeAccelerator> encoder; -#if defined(OS_CHROMEOS) -#if defined(ARCH_CPU_ARMEL) && defined(USE_X11) +#if defined(OS_CHROMEOS) && defined(USE_X11) +#if defined(ARCH_CPU_ARMEL) scoped_ptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kEncoder); if (device) encoder.reset(new V4L2VideoEncodeAccelerator(device.Pass())); #elif defined(ARCH_CPU_X86_FAMILY) const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (!cmd_line->HasSwitch(switches::kDisableVaapiAcceleratedVideoEncode)) - encoder.reset(new VaapiVideoEncodeAccelerator()); + encoder.reset(new VaapiVideoEncodeAccelerator(gfx::GetXDisplay())); #endif #elif defined(OS_ANDROID) && defined(ENABLE_WEBRTC) encoder.reset(new AndroidVideoEncodeAccelerator()); |