diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-26 16:24:11 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-26 16:24:11 +0000 |
| commit | d0d5018b2f5aa82ef8a57987b66028e9096190ad (patch) | |
| tree | b6d0a98370944db3bcbb880ea41049f6e6124a48 /media/media.gyp | |
| parent | 75b73b2aa8745e2383ee821a0010ea3075f1931a (diff) | |
| download | chromium_src-d0d5018b2f5aa82ef8a57987b66028e9096190ad.zip chromium_src-d0d5018b2f5aa82ef8a57987b66028e9096190ad.tar.gz chromium_src-d0d5018b2f5aa82ef8a57987b66028e9096190ad.tar.bz2 | |
Revert 279958 "Revert "Revert 279650 "Add VaapiVideoEncodeAccele..."
This once again broke the cros_x86 builder. I think you want the Range to be static_cast<size_t> not static_cast<uint32>.
http://build.chromium.org/p/chromiumos.chromium/builders/X86%20%28chromium%29/builds/333
chromeos-chrome-38.0.2071.0_alpha-r1: ../../../../../../../home/chrome-bot/chrome_root/src/media/filters/h264_bitstream_buffer_unittest.cc:52:226: error: could not convert 'testing::Range(T, T) [with T = long long unsigned int](65ull)' from 'testing::internal::ParamGenerator<long long unsigned int>' to 'testing::internal::ParamGenerator<unsigned int>'
chromeos-chrome-38.0.2071.0_alpha-r1: INSTANTIATE_TEST_CASE_P(AppendNumBits,
> Revert "Revert 279650 "Add VaapiVideoEncodeAccelerator for HW-accelerate...""
>
> Fixing the cros_trunk builder compilation failure in
> h264_bitstream_buffer_unittest, for which this was reverted.
>
> > Revert 279650 "Add VaapiVideoEncodeAccelerator for HW-accelerate..."
> >
> > Broke the Chrome-on-Chrome OS compile
> >
> > http://master.chrome.corp.google.com:8011/builders/cros%20trunk/builds/21417
> >
> > > Add VaapiVideoEncodeAccelerator for HW-accelerated video encode.
> > >
> > > Add an implementation of VideoEncodeAccelerator utilizing VA-API for
> > > hardware encode on Intel-based ChromeOS platforms.
> > >
> > > BUG=378962
> > > TEST=video_encode_accelerator_unittest
> > >
> > > Review URL: https://codereview.chromium.org/333253002
> >
> > TBR=posciak@chromium.org
> >
> > Review URL: https://codereview.chromium.org/350413002
> >
> > git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279733 0039d316-1c4b-4281-b951-d872f2087c98
>
> TBR=jamescook@chromium.org
> BUG=388778,378962
>
> Review URL: https://codereview.chromium.org/356903002
TBR=posciak@chromium.org
Review URL: https://codereview.chromium.org/357903003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/media/media.gyp b/media/media.gyp index 1b3987a..7a38a4f 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -659,13 +659,6 @@ 'formats/webm/chromeos/webm_encoder.h', ], }], - # For VaapiVideoEncodeAccelerator. - ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { - 'sources': [ - 'filters/h264_bitstream_buffer.cc', - 'filters/h264_bitstream_buffer.h', - ], - }], ['OS!="ios"', { 'dependencies': [ '../third_party/libyuv/libyuv.gyp:libyuv', @@ -1230,11 +1223,6 @@ }], ], }], - ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { - 'sources': [ - 'filters/h264_bitstream_buffer_unittest.cc', - ], - }], ['use_alsa==0', { 'sources!': [ 'audio/alsa/alsa_output_unittest.cc', |