Return buffers from StreamParsers in a single unified map

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 <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 82 matching lines @@
   EXPECT_EQ(tracks->tracks().size(), 1u);
   const auto& track = tracks->tracks()[0];
   EXPECT_EQ(track->type(), MediaTrack::Audio);
   audio_track_id_ = track->bytestream_track_id();
   last_audio_config_ = tracks->getAudioConfig(track->bytestream_track_id());
   EXPECT_TRUE(last_audio_config_.IsValidConfig());
   return true;
 }
 
 bool StreamParserTestBase::OnNewBuffers(
-    const StreamParser::BufferQueue& audio_buffers,
-    const StreamParser::BufferQueue& video_buffers,
-    const StreamParser::TextBufferQueueMap& text_map) {
+    const StreamParser::BufferQueueMap& buffer_queue_map) {
+  EXPECT_EQ(1u, buffer_queue_map.size());
+  const auto& itr_audio = buffer_queue_map.find(audio_track_id_);
+  EXPECT_NE(buffer_queue_map.end(), itr_audio);
+  const StreamParser::BufferQueue& audio_buffers = itr_audio->second;
   EXPECT_FALSE(audio_buffers.empty());
-  EXPECT_TRUE(video_buffers.empty());
 
   // Ensure that track ids are properly assigned on all emitted buffers.
   for (const auto& buf : audio_buffers) {
     EXPECT_EQ(audio_track_id_, buf->track_id());
   }
 
-  // TODO(wolenetz/acolwell): Add text track support to more MSE parsers. See
-  // http://crbug.com/336926.
-  EXPECT_TRUE(text_map.empty());
-
   const std::string buffers_str = BufferQueueToString(audio_buffers);
   DVLOG(1) << __FUNCTION__ << " : " << buffers_str;
   results_stream_ << buffers_str;
   return true;
 }
 
 void StreamParserTestBase::OnKeyNeeded(EmeInitDataType type,
                                        const std::vector<uint8_t>& init_data) {
   DVLOG(1) << __FUNCTION__ << "(" << static_cast<int>(type) << ", "
            << init_data.size() << ")";
 }
 
 void StreamParserTestBase::OnNewSegment() {
   DVLOG(1) << __FUNCTION__;
   results_stream_ << "NewSegment";
 }
 
 void StreamParserTestBase::OnEndOfSegment() {
   DVLOG(1) << __FUNCTION__;
   results_stream_ << "EndOfSegment";
 }
 
 }  // namespace media