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

Unified Diff: media/formats/common/stream_parser_test_base.cc

Issue 1716503002: Basic media tracks implementation for media stream parsers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 10 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/formats/common/stream_parser_test_base.h ('k') | media/formats/mp2t/mp2t_stream_parser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..b42173f087f01c873c082b5fbf9209749a27c0a5 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,13 @@ 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_EQ(tracks->tracks().size(), 1u);
+ EXPECT_TRUE(tracks->getFirstAudioConfig().IsValidConfig());
+ EXPECT_FALSE(tracks->getFirstVideoConfig().IsValidConfig());
+ last_audio_config_ = tracks->getFirstAudioConfig();
return true;
}
« no previous file with comments | « media/formats/common/stream_parser_test_base.h ('k') | media/formats/mp2t/mp2t_stream_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698