Basic media tracks implementation for media stream parsers

media/formats/common/stream_parser_test_base.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/common/stream_parser_test_base.h"
 
 #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"
 
 namespace media {
 
 static std::string BufferQueueToString(
     const StreamParser::BufferQueue& buffers) {
   std::stringstream ss;
 
   ss << "{";
@@ skipping 56 matching lines @@
 }
 
 void StreamParserTestBase::OnInitDone(
     const StreamParser::InitParameters& params) {
   EXPECT_TRUE(params.auto_update_timestamp_offset);
   DVLOG(1) << __FUNCTION__ << "(" << params.duration.InMilliseconds() << ", "
            << params.auto_update_timestamp_offset << ")";
 }
 
 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_TRUE(tracks->getFirstAudioConfig().IsValidConfig());
+  EXPECT_FALSE(tracks->getFirstVideoConfig().IsValidConfig());

[wolenetz, 2016/02/26 00:06:21]

nit: also expect number of tracks in |tracks| to be exactly 1 until / unless
test behavior and product support changes to allow multitrack audio/video?

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

Done.

+  last_audio_config_ = tracks->getFirstAudioConfig();
   return true;
 }
 
 bool StreamParserTestBase::OnNewBuffers(
     const StreamParser::BufferQueue& audio_buffers,
     const StreamParser::BufferQueue& video_buffers,
     const StreamParser::TextBufferQueueMap& text_map) {
   EXPECT_FALSE(audio_buffers.empty());
   EXPECT_TRUE(video_buffers.empty());
 
@@ skipping 17 matching lines @@
   DVLOG(1) << __FUNCTION__;
   results_stream_ << "NewSegment";
 }
 
 void StreamParserTestBase::OnEndOfSegment() {
   DVLOG(1) << __FUNCTION__;
   results_stream_ << "EndOfSegment";
 }
 
 }  // namespace media