diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-28 03:02:48 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-28 03:02:48 +0000 |
| commit | 27510d2d23add6f2ab252cb054aacfa77b11e663 (patch) | |
| tree | d0572a33cdca569116d16415be59814520a139ad /media | |
| parent | 20821861f10e6dd9a73cabf0def42b29f1abc62c (diff) | |
| download | chromium_src-27510d2d23add6f2ab252cb054aacfa77b11e663.zip chromium_src-27510d2d23add6f2ab252cb054aacfa77b11e663.tar.gz chromium_src-27510d2d23add6f2ab252cb054aacfa77b11e663.tar.bz2 | |
mock test 3 threads not 2 for media
BUG=none
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/filters/ffmpeg_video_decode_engine_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/filters/ffmpeg_video_decode_engine_unittest.cc b/media/filters/ffmpeg_video_decode_engine_unittest.cc index b52e635..b60ec7a 100644 --- a/media/filters/ffmpeg_video_decode_engine_unittest.cc +++ b/media/filters/ffmpeg_video_decode_engine_unittest.cc @@ -79,7 +79,7 @@ class FFmpegVideoDecodeEngineTest : public testing::Test, .WillOnce(Return(&codec_)); EXPECT_CALL(*MockFFmpeg::get(), AVCodecAllocFrame()) .WillOnce(Return(&yuv_frame_)); - EXPECT_CALL(*MockFFmpeg::get(), AVCodecThreadInit(&codec_context_, 3)) + EXPECT_CALL(*MockFFmpeg::get(), AVCodecThreadInit(&codec_context_, 2)) .WillOnce(Return(0)); EXPECT_CALL(*MockFFmpeg::get(), AVCodecOpen(&codec_context_, &codec_)) .WillOnce(Return(0)); @@ -154,7 +154,7 @@ TEST_F(FFmpegVideoDecodeEngineTest, Initialize_InitThreadFails) { .WillOnce(Return(&codec_)); EXPECT_CALL(*MockFFmpeg::get(), AVCodecAllocFrame()) .WillOnce(Return(&yuv_frame_)); - EXPECT_CALL(*MockFFmpeg::get(), AVCodecThreadInit(&codec_context_, 3)) + EXPECT_CALL(*MockFFmpeg::get(), AVCodecThreadInit(&codec_context_, 2)) .WillOnce(Return(-1)); EXPECT_CALL(*MockFFmpeg::get(), AVFree(&yuv_frame_)) .Times(1); |