diff options
| author | posciak@chromium.org <posciak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-27 08:43:02 +0000 |
|---|---|---|
| committer | posciak@chromium.org <posciak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-27 08:43:02 +0000 |
| commit | b75c9c87e9a398df9ba07266215c986cb6c948b3 (patch) | |
| tree | c1d35ea0845b32ee51d1ef05dceb68e49215c23a /content/content_tests.gypi | |
| parent | b6d90cb12f3886114cc5ac57e1563bf341dd4415 (diff) | |
| download | chromium_src-b75c9c87e9a398df9ba07266215c986cb6c948b3.zip chromium_src-b75c9c87e9a398df9ba07266215c986cb6c948b3.tar.gz chromium_src-b75c9c87e9a398df9ba07266215c986cb6c948b3.tar.bz2 | |
Revert 280020 "Revert 279958 "Revert "Revert 279650 "Add VaapiVideoEncodeAccele...""
Another try at fixing unittest compile on the affected bot.
TBR=jamescook@chromium.org
BUG=388778,378962
> 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
Review URL: https://codereview.chromium.org/356153002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_tests.gypi')
| -rw-r--r-- | content/content_tests.gypi | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 725f69a..20acf60 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -1468,7 +1468,7 @@ }, ] }], - ['chromeos==1 and target_arch == "arm"', { + ['chromeos==1 and (target_arch == "arm" or use_x11 == 1)', { 'targets': [ { 'target_name': 'video_encode_accelerator_unittest', @@ -1488,6 +1488,17 @@ 'common/gpu/media/video_accelerator_unittest_helpers.h', 'common/gpu/media/video_encode_accelerator_unittest.cc', ], + 'include_dirs': [ + '<(DEPTH)/third_party/libva', + '<(DEPTH)/third_party/libyuv', + ], + 'conditions': [ + ['use_x11==1', { + 'dependencies': [ + '../ui/gfx/x/gfx_x11.gyp:gfx_x11', + ], + }], + ], }, ] }], |