diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 22:44:04 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 22:44:04 +0000 |
| commit | 1ab1c24bda1b30b57e040b3b077a001d095fcab3 (patch) | |
| tree | 59e01bd62cc44596a5d8df6c7e63e6414846b4a8 /media/video | |
| parent | 735586ec444f701f94219fbb59ff01f11b064071 (diff) | |
| download | chromium_src-1ab1c24bda1b30b57e040b3b077a001d095fcab3.zip chromium_src-1ab1c24bda1b30b57e040b3b077a001d095fcab3.tar.gz chromium_src-1ab1c24bda1b30b57e040b3b077a001d095fcab3.tar.bz2 | |
Introduce AudioDecoderConfig to migrate away from GetAVStream().
Instead add DemuxerStream::audio_decoder_config() to break FFmpegAudioDecoder's dependency on the AVCodecContext object maintained by FFmpegDemuxer.
Review URL: http://codereview.chromium.org/7867051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/video')
| -rw-r--r-- | media/video/ffmpeg_video_decode_engine_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/video/ffmpeg_video_decode_engine_unittest.cc b/media/video/ffmpeg_video_decode_engine_unittest.cc index e8238ff..8e171e1 100644 --- a/media/video/ffmpeg_video_decode_engine_unittest.cc +++ b/media/video/ffmpeg_video_decode_engine_unittest.cc @@ -149,8 +149,10 @@ TEST_F(FFmpegVideoDecodeEngineTest, Initialize_Normal) { } TEST_F(FFmpegVideoDecodeEngineTest, Initialize_FindDecoderFails) { - VideoDecoderConfig config(kUnknown, kCodedSize, kVisibleRect, kNaturalSize, - kFrameRate.num, kFrameRate.den, NULL, 0); + VideoDecoderConfig config(kUnknownVideoCodec, kCodedSize, kVisibleRect, + kNaturalSize, kFrameRate.num, kFrameRate.den, + NULL, 0); + // Test avcodec_find_decoder() returning NULL. VideoCodecInfo info; EXPECT_CALL(*this, OnInitializeComplete(_)) |