Implement reading of media track info from WebM and MP4 containers

media/formats/mp4/mp4_stream_parser_unittest.cc

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 1fd2b7533b3579bf943cbf165ca9dd83598b6c73..3bb17efadf52554ed666fa0c525383ad98eb1ff2 100644
--- a/media/formats/mp4/mp4_stream_parser_unittest.cc
+++ b/media/formats/mp4/mp4_stream_parser_unittest.cc
@@ -69,6 +69,7 @@ class MP4StreamParserTest : public testing::Test {
   scoped_refptr<StrictMock<MockMediaLog>> media_log_;
   scoped_ptr<MP4StreamParser> parser_;
   bool configs_received_;
+  scoped_ptr<MediaTracks> media_tracks_;
   AudioDecoderConfig audio_decoder_config_;
   VideoDecoderConfig video_decoder_config_;
   DecodeTimestamp lower_bound_;
@@ -102,9 +103,11 @@ class MP4StreamParserTest : public testing::Test {
   bool NewConfigF(scoped_ptr<MediaTracks> tracks,
                   const StreamParser::TextTrackConfigMap& tc) {
     configs_received_ = true;
-    audio_decoder_config_ = tracks->getFirstAudioConfig();
-    video_decoder_config_ = tracks->getFirstVideoConfig();
-    DVLOG(1) << "NewConfigF: track count=" << tracks->tracks().size()
+    CHECK(tracks.get());
+    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;
@@ -403,5 +406,26 @@ TEST_F(MP4StreamParserTest, FourCCToString) {
   EXPECT_EQ("0x66616b00", FourCCToString(static_cast<FourCC>(0x66616b00)));
 }
 
+TEST_F(MP4StreamParserTest, MediaTrackInfoSourcing) {
+  EXPECT_MEDIA_LOG(VideoCodecLog("avc1.64001F"));
+  EXPECT_MEDIA_LOG(AudioCodecLog("mp4a.40.2"));
+  ParseMP4File("bear-1280x720-av_frag.mp4", 4096);

[wolenetz, 2016/03/05 03:26:21]

nit: we probably need (for webm and mp4 across both src= and mp4 unit tests)
more test coverage / media for various language and label, at least. Can you
file a follow-up crbug to do this later please?

[servolk, 2016/03/07 23:45:01]

Opened crbug.com/592717 for tracking this.

[wolenetz, 2016/03/10 19:53:29]

Acknowledged.

+
+  EXPECT_EQ(media_tracks_->tracks().size(), 2u);
+  const MediaTrack& video_track = *(media_tracks_->tracks()[0]);
+  EXPECT_EQ(video_track.type(), MediaTrack::Video);
+  EXPECT_EQ(video_track.id(), "1");
+  EXPECT_EQ(video_track.kind(), "main");
+  EXPECT_EQ(video_track.label(), "VideoHandler");
+  EXPECT_EQ(video_track.language(), "und");
+
+  const MediaTrack& audio_track = *(media_tracks_->tracks()[1]);
+  EXPECT_EQ(audio_track.type(), MediaTrack::Audio);
+  EXPECT_EQ(audio_track.id(), "2");
+  EXPECT_EQ(audio_track.kind(), "main");
+  EXPECT_EQ(audio_track.label(), "SoundHandler");
+  EXPECT_EQ(audio_track.language(), "und");
+}
+
 }  // namespace mp4
 }  // namespace media