media/filters/ffmpeg_demuxer_unittest.cc - Issue 11280301: Roll FFMpeg for M26. Fix ffmpeg float audio decoding.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/filters/ffmpeg_demuxer_unittest.cc

Issue 11280301: Roll FFMpeg for M26. Fix ffmpeg float audio decoding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix DCHECK. Roll DEPS for fix. Created 8 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: media/filters/ffmpeg_demuxer_unittest.cc

diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc

index bdb7547fe33e1c92cf433d8dd70367ff98a6a779..c1efa8efc2af1eee8405be2b4e4c75549518b139 100644

--- a/media/filters/ffmpeg_demuxer_unittest.cc

+++ b/media/filters/ffmpeg_demuxer_unittest.cc

@@ -243,9 +243,10 @@ TEST_F(FFmpegDemuxerTest, Initialize_Successful) {

const AudioDecoderConfig& audio_config = stream->audio_decoder_config();

EXPECT_EQ(kCodecVorbis, audio_config.codec());

- EXPECT_EQ(16, audio_config.bits_per_channel());

+ EXPECT_EQ(32, audio_config.bits_per_channel());

EXPECT_EQ(CHANNEL_LAYOUT_STEREO, audio_config.channel_layout());

EXPECT_EQ(44100, audio_config.samples_per_second());

+ EXPECT_EQ(kSampleFormatPlanarF32, audio_config.sample_format());

EXPECT_TRUE(audio_config.extra_data());

EXPECT_GT(audio_config.extra_data_size(), 0u);