Chromium Code Reviews| Index: media/formats/mp2t/mp2t_stream_parser_unittest.cc |
| diff --git a/media/formats/mp2t/mp2t_stream_parser_unittest.cc b/media/formats/mp2t/mp2t_stream_parser_unittest.cc |
| index ab1d2306290c56d6670d4fbe09b2d947b1d4e433..90dfbd222f8dc9de823e7b4481089b00ea84af32 100644 |
| --- a/media/formats/mp2t/mp2t_stream_parser_unittest.cc |
| +++ b/media/formats/mp2t/mp2t_stream_parser_unittest.cc |
| @@ -15,6 +15,8 @@ |
| #include "base/time/time.h" |
| #include "media/base/audio_decoder_config.h" |
| #include "media/base/decoder_buffer.h" |
| +#include "media/base/media_track.h" |
| +#include "media/base/media_tracks.h" |
| #include "media/base/stream_parser_buffer.h" |
| #include "media/base/test_data_util.h" |
| #include "media/base/text_track_config.h" |
| @@ -111,12 +113,12 @@ class Mp2tStreamParserTest : public testing::Test { |
| << ", autoTimestampOffset=" << params.auto_update_timestamp_offset; |
| } |
| - bool OnNewConfig(const AudioDecoderConfig& ac, |
| - const VideoDecoderConfig& vc, |
| + bool OnNewConfig(scoped_ptr<MediaTracks> tracks, |
| const StreamParser::TextTrackConfigMap& tc) { |
| - DVLOG(1) << "OnNewConfig: audio=" << ac.IsValidConfig() |
| - << ", video=" << vc.IsValidConfig(); |
| + DVLOG(1) << "OnNewConfig: media tracks count=" << tracks->tracks().size(); |
| config_count_++; |
| + const AudioDecoderConfig& ac = tracks->getFirstAudioConfig(); |
| + const VideoDecoderConfig& vc = tracks->getFirstVideoConfig(); |
|
wolenetz
2016/02/26 00:06:21
nit: let's also preserve the previous DVLOG(1) whi
servolk
2016/02/26 01:56:33
Done.
|
| EXPECT_TRUE(ac.IsValidConfig()); |
| EXPECT_EQ(vc.IsValidConfig(), has_video_); |
| return true; |