diff options
| author | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 04:24:33 +0000 |
|---|---|---|
| committer | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 04:24:33 +0000 |
| commit | 22b5d905166de8d6c704f3a11cd82bc2df5423af (patch) | |
| tree | 7cb00d6327c67c09078b03998336b66b5e724071 /media/ffmpeg | |
| parent | 4deb64508c16020d0af0d28b6e0e4631eacf63e6 (diff) | |
| download | chromium_src-22b5d905166de8d6c704f3a11cd82bc2df5423af.zip chromium_src-22b5d905166de8d6c704f3a11cd82bc2df5423af.tar.gz chromium_src-22b5d905166de8d6c704f3a11cd82bc2df5423af.tar.bz2 | |
Enable multithreaded theora decode.
BUG=53967
TEST=Ran all layout tests, ffmpeg_unittests, ffmpeg_regression_tests.
Review URL: http://codereview.chromium.org/9700051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127102 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg')
| -rw-r--r-- | media/ffmpeg/ffmpeg_unittest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/ffmpeg/ffmpeg_unittest.cc b/media/ffmpeg/ffmpeg_unittest.cc index 121f0a6..607fc97 100644 --- a/media/ffmpeg/ffmpeg_unittest.cc +++ b/media/ffmpeg/ffmpeg_unittest.cc @@ -177,8 +177,7 @@ class FFmpegTest : public testing::TestWithParam<const char*> { av_codec_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; av_codec_context->err_recognition = AV_EF_CAREFUL; - av_codec_context->thread_count = ( - av_codec_context->codec_id == CODEC_ID_THEORA ? 1 : kDecodeThreads); + av_codec_context->thread_count = kDecodeThreads; EXPECT_EQ(0, avcodec_open2(av_codec_context, av_codec, NULL)) << "Could not open AVCodecContext with CodecID " |