Basic media tracks implementation for media stream parsers

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 <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/mock_media_log.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/mp4/es_descriptor.h"
 #include "media/formats/mp4/mp4_stream_parser.h"
 #include "media/media_features.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 61 matching lines @@
     return true;
   }
 
   void InitF(DemuxerStream::Liveness expected_liveness,
              const StreamParser::InitParameters& params) {
     DVLOG(1) << "InitF: dur=" << params.duration.InMilliseconds()
              << ", autoTimestampOffset=" << params.auto_update_timestamp_offset;
     EXPECT_EQ(expected_liveness, params.liveness);
   }
 
-  bool NewConfigF(const AudioDecoderConfig& ac,
-                  const VideoDecoderConfig& vc,
+  bool NewConfigF(scoped_ptr<MediaTracks> tracks,
                   const StreamParser::TextTrackConfigMap& tc) {
-    DVLOG(1) << "NewConfigF: audio=" << ac.IsValidConfig()
-             << ", video=" << vc.IsValidConfig();
+    DVLOG(1) << "NewConfigF: tracks=" << tracks->tracks().size();
     configs_received_ = true;
-    audio_decoder_config_ = ac;
-    video_decoder_config_ = vc;
+    audio_decoder_config_ = tracks->getFirstAudioConfig();
+    video_decoder_config_ = tracks->getFirstVideoConfig();

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

ditto: let's preserve also the previous DVLOG(1) functionality (though
s/ac/audio_decoder_config_/ and s/vc/.../ in it, of course

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

Done.

     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 267 matching lines @@
 
   InitializeParserAndExpectLiveness(DemuxerStream::LIVENESS_RECORDED);
   scoped_refptr<DecoderBuffer> buffer =
       ReadTestDataFile("bear-eac3-only-frag.mp4");
   EXPECT_EQ(expect_success,
             AppendDataInPieces(buffer->data(), buffer->data_size(), 512));
 }
 
 }  // namespace mp4
 }  // namespace media