Basic media tracks implementation for media stream parsers

media/formats/mp2t/mp2t_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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #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"
 #include "media/base/video_decoder_config.h"
 #include "media/formats/mp2t/mp2t_stream_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 namespace mp2t {
 
@@ skipping 76 matching lines @@
       start += append_size;
     }
     return true;
   }
 
   void OnInit(const StreamParser::InitParameters& params) {
     DVLOG(1) << "OnInit: dur=" << params.duration.InMilliseconds()
              << ", 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) which would provide additional
info about config validity for each of A/V.

[servolk, 2016/02/26 01:56:33]

Done.

     EXPECT_TRUE(ac.IsValidConfig());
     EXPECT_EQ(vc.IsValidConfig(), has_video_);
     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();
@@ skipping 160 matching lines @@
   parser_->Flush();
   EXPECT_EQ(audio_frame_count_, 40);
   EXPECT_EQ(video_frame_count_, 0);
   // This stream has no mid-stream configuration change.
   EXPECT_EQ(config_count_, 1);
   EXPECT_EQ(segment_count_, 1);
 }
 
 }  // namespace mp2t
 }  // namespace media