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

Unified Diff: media/formats/mp4/mp4_stream_parser_unittest.cc

Issue 1833053005: Remove MediaTracks::getFirstAudio/VideoConfig (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@track-control
Patch Set: rebase Created 4 years, 6 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
Index: media/formats/mp4/mp4_stream_parser_unittest.cc
diff --git a/media/formats/mp4/mp4_stream_parser_unittest.cc b/media/formats/mp4/mp4_stream_parser_unittest.cc
index 7109c20ddf6ac118f815d2c4b08634574448b46b..046ac996fab40ba34cf4266dafb26be3b24ee0cd 100644
--- a/media/formats/mp4/mp4_stream_parser_unittest.cc
+++ b/media/formats/mp4/mp4_stream_parser_unittest.cc
@@ -117,12 +117,26 @@ class MP4StreamParserTest : public testing::Test {
const StreamParser::TextTrackConfigMap& tc) {
configs_received_ = true;
CHECK(tracks.get());
+ DVLOG(1) << "NewConfigF: got " << tracks->tracks().size() << " tracks";
+ for (const auto& track : tracks->tracks()) {
+ const auto& track_id = track->bytestream_track_id();
+ if (track->type() == MediaTrack::Audio) {
+ const auto& audio_config = tracks->getAudioConfig(track_id);
wolenetz 2016/06/16 20:20:36 nit: why not drop this local var and just assign t
servolk 2016/06/16 21:14:07 Done.
+ DVLOG(1) << "Audio track " << track_id
+ << " config=" << (audio_config.IsValidConfig()
+ ? audio_config.AsHumanReadableString()
+ : "INVALID");
+ audio_decoder_config_ = audio_config;
+ } else if (track->type() == MediaTrack::Video) {
+ const auto& video_config = tracks->getVideoConfig(track_id);
+ DVLOG(1) << "Video track " << track_id
+ << " config=" << (video_config.IsValidConfig()
+ ? video_config.AsHumanReadableString()
+ : "INVALID");
+ video_decoder_config_ = video_config;
+ }
+ }
media_tracks_ = std::move(tracks);
- audio_decoder_config_ = media_tracks_->getFirstAudioConfig();
- video_decoder_config_ = media_tracks_->getFirstVideoConfig();
- DVLOG(1) << "NewConfigF: track count=" << media_tracks_->tracks().size()
- << " audio=" << audio_decoder_config_.IsValidConfig()
- << " video=" << video_decoder_config_.IsValidConfig();
return true;
}

Powered by Google App Engine
This is Rietveld 408576698