Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Unified Diff: media/filters/ffmpeg_audio_decoder_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 AFR. 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:
View side-by-side diff with in-line comments
Download patch
Index: media/filters/ffmpeg_audio_decoder_unittest.cc
diff --git a/media/filters/ffmpeg_audio_decoder_unittest.cc b/media/filters/ffmpeg_audio_decoder_unittest.cc
index 2ad7ab83b5a24dc17c95f6341ba0f462666a8941..5ac8f19f09d632e1508553db7b5f21ff2ff36575 100644
--- a/media/filters/ffmpeg_audio_decoder_unittest.cc
+++ b/media/filters/ffmpeg_audio_decoder_unittest.cc
@@ -54,11 +54,12 @@ class FFmpegAudioDecoderTest : public testing::Test {
encoded_audio_.push_back(DecoderBuffer::CreateEOSBuffer());
config_.Initialize(kCodecVorbis,
- 16,
+ 32,
CHANNEL_LAYOUT_STEREO,
44100,
vorbis_extradata_->GetData(),
vorbis_extradata_->GetDataSize(),
+ kSampleFormatFLTP,
false, // Not encrypted.
true);
}
@@ -128,9 +129,9 @@ class FFmpegAudioDecoderTest : public testing::Test {
TEST_F(FFmpegAudioDecoderTest, Initialize) {
Initialize();
- EXPECT_EQ(16, decoder_->bits_per_channel());
- EXPECT_EQ(CHANNEL_LAYOUT_STEREO, decoder_->channel_layout());
- EXPECT_EQ(44100, decoder_->samples_per_second());
+ EXPECT_EQ(config_.bits_per_channel(), decoder_->bits_per_channel());
+ EXPECT_EQ(config_.channel_layout(), decoder_->channel_layout());
+ EXPECT_EQ(config_.samples_per_second(), decoder_->samples_per_second());
}
TEST_F(FFmpegAudioDecoderTest, ProduceAudioSamples) {

Powered by Google App Engine
This is Rietveld 408576698