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 /media/media.gyp | |
| 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 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/media.gyp b/media/media.gyp index 1aa2556..c16a880 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -697,7 +697,7 @@ ], }], # For VaapiVideoEncodeAccelerator. - ['target_arch != "arm" and chromeos == 1', { + ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { 'sources': [ 'filters/h264_bitstream_buffer.cc', 'filters/h264_bitstream_buffer.h', |