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

Unified Diff: media/filters/ffmpeg_demuxer_unittest.cc

Issue 7867051: Introduce AudioDecoderConfig to migrate away from GetAVStream(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: samples_per_second Created 9 years, 3 months 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
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/media.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer_unittest.cc
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index e6368494b6be064be67ec255607779a7979d1967..d5c76ae5592df31e7bfd16c3e3158e7a32df3883 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -170,18 +170,27 @@ TEST_F(FFmpegDemuxerTest, Initialize_NoStreams) {
TEST_F(FFmpegDemuxerTest, Initialize_Successful) {
InitializeDemuxer(CreateDataSource("bear-320x240.webm"));
- // First stream should be video and support the FFmpegDemuxerStream interface.
+ // Video stream should be present.
scoped_refptr<DemuxerStream> stream =
demuxer_->GetStream(DemuxerStream::VIDEO);
ASSERT_TRUE(stream);
EXPECT_EQ(DemuxerStream::VIDEO, stream->type());
ASSERT_TRUE(stream->GetAVStream());
- // Other stream should be audio and support the FFmpegDemuxerStream interface.
+ // Audio stream should be present.
stream = demuxer_->GetStream(DemuxerStream::AUDIO);
ASSERT_TRUE(stream);
EXPECT_EQ(DemuxerStream::AUDIO, stream->type());
ASSERT_TRUE(stream->GetAVStream());
+
+ // FFmpegDemuxer's audio streams support AudioDecoderConfig structs.
+ const AudioDecoderConfig& config = stream->audio_decoder_config();
+ EXPECT_EQ(kCodecVorbis, config.codec());
+ EXPECT_EQ(16, config.bits_per_channel());
+ EXPECT_EQ(CHANNEL_LAYOUT_STEREO, config.channel_layout());
+ EXPECT_EQ(44100, config.samples_per_second());
+ EXPECT_TRUE(config.extra_data());
+ EXPECT_GT(config.extra_data_size(), 0u);
}
TEST_F(FFmpegDemuxerTest, Read_Audio) {
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698