Remove MediaTracks::getFirstAudio/VideoConfig

media/formats/mp4/mp4_stream_parser_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/formats/mp4/mp4_stream_parser.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 99 matching lines @@
     EXPECT_EQ(expected_params.detected_video_track_count,
               params.detected_video_track_count);
     EXPECT_EQ(expected_params.detected_text_track_count,
               params.detected_text_track_count);
   }
 
   bool NewConfigF(std::unique_ptr<MediaTracks> tracks,
                   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) {
+        audio_decoder_config_ = tracks->getAudioConfig(track_id);
+        DVLOG(1) << "Audio track " << track_id << " config="
+                 << (audio_decoder_config_.IsValidConfig()
+                         ? audio_decoder_config_.AsHumanReadableString()
+                         : "INVALID");
+      } else if (track->type() == MediaTrack::Video) {
+        video_decoder_config_ = tracks->getVideoConfig(track_id);
+        DVLOG(1) << "Video track " << track_id << " config="
+                 << (video_decoder_config_.IsValidConfig()
+                         ? video_decoder_config_.AsHumanReadableString()
+                         : "INVALID");
+      }
+    }
     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;
   }
 
   void DumpBuffers(const std::string& label,
                    const StreamParser::BufferQueue& buffers) {
     DVLOG(2) << "DumpBuffers: " << label << " size " << buffers.size();
     for (StreamParser::BufferQueue::const_iterator buf = buffers.begin();
          buf != buffers.end(); buf++) {
       DVLOG(3) << "  n=" << buf - buffers.begin()
                << ", size=" << (*buf)->data_size()
@@ skipping 15 matching lines @@
     // Find the second highest timestamp so that we know what the
     // timestamps on the next set of buffers must be >= than.
     DecodeTimestamp audio = !audio_buffers.empty() ?
         audio_buffers.back()->GetDecodeTimestamp() : kNoDecodeTimestamp();
     DecodeTimestamp video = !video_buffers.empty() ?
         video_buffers.back()->GetDecodeTimestamp() : kNoDecodeTimestamp();
     DecodeTimestamp second_highest_timestamp =
         (audio == kNoDecodeTimestamp() ||
          (video != kNoDecodeTimestamp() && audio > video)) ? video : audio;
 
-    DCHECK(second_highest_timestamp != kNoDecodeTimestamp());
+    EXPECT_NE(second_highest_timestamp, kNoDecodeTimestamp());
 
     if (lower_bound_ != kNoDecodeTimestamp() &&
         second_highest_timestamp < lower_bound_) {
       return false;
     }
 
     lower_bound_ = second_highest_timestamp;
     return true;
   }
 
@@ skipping 348 matching lines @@
   scoped_refptr<DecoderBuffer> buffer =
       ReadTestDataFile("bear-1280x720-avt_subt_frag.mp4");
 
   EXPECT_MEDIA_LOG(AudioCodecLog("mp4a.40.2"));
   EXPECT_MEDIA_LOG(VideoCodecLog("avc1.64001F"));
   EXPECT_TRUE(AppendDataInPieces(buffer->data(), buffer->data_size(), 512));
 }
 
 }  // namespace mp4
 }  // namespace media