Chromium Code Reviews| Index: media/formats/common/stream_parser_test_base.cc |
| diff --git a/media/formats/common/stream_parser_test_base.cc b/media/formats/common/stream_parser_test_base.cc |
| index de80bac73f872c983bc7ed7d77517595ef866af4..b3361605d9399345063d4c5440a954131713b437 100644 |
| --- a/media/formats/common/stream_parser_test_base.cc |
| +++ b/media/formats/common/stream_parser_test_base.cc |
| @@ -7,6 +7,8 @@ |
| #include <utility> |
| #include "base/bind.h" |
| +#include "media/base/media_track.h" |
| +#include "media/base/media_tracks.h" |
| #include "media/base/test_data_util.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| @@ -83,14 +85,12 @@ void StreamParserTestBase::OnInitDone( |
| } |
| bool StreamParserTestBase::OnNewConfig( |
| - const AudioDecoderConfig& audio_config, |
| - const VideoDecoderConfig& video_config, |
| + scoped_ptr<MediaTracks> tracks, |
| const StreamParser::TextTrackConfigMap& text_config) { |
| - DVLOG(1) << __FUNCTION__ << "(" << audio_config.IsValidConfig() << ", " |
| - << video_config.IsValidConfig() << ")"; |
| - EXPECT_TRUE(audio_config.IsValidConfig()); |
| - EXPECT_FALSE(video_config.IsValidConfig()); |
| - last_audio_config_ = audio_config; |
| + DVLOG(1) << __FUNCTION__ << " media tracks count=" << tracks->tracks().size(); |
| + EXPECT_TRUE(tracks->getFirstAudioConfig().IsValidConfig()); |
| + EXPECT_FALSE(tracks->getFirstVideoConfig().IsValidConfig()); |
|
wolenetz
2016/02/26 00:06:21
nit: also expect number of tracks in |tracks| to b
servolk
2016/02/26 01:56:32
Done.
|
| + last_audio_config_ = tracks->getFirstAudioConfig(); |
| return true; |
| } |