Return buffers from StreamParsers in a single unified map

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 dcc14b9712dc3b15381b52a9fbe9b6a7e76c5727..7b568d18b59bcf8193c52595d93cbb2c41d23791 100644
--- a/media/formats/mp4/mp4_stream_parser_unittest.cc
+++ b/media/formats/mp4/mp4_stream_parser_unittest.cc
@@ -142,35 +142,30 @@ class MP4StreamParserTest : public testing::Test {
     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()
-               << ", dur=" << (*buf)->duration().InMilliseconds();
-    }
-  }
-
-  bool NewBuffersF(const StreamParser::BufferQueue& audio_buffers,
-                   const StreamParser::BufferQueue& video_buffers,
-                   const StreamParser::TextBufferQueueMap& text_map) {
-    DumpBuffers("audio_buffers", audio_buffers);
-    DumpBuffers("video_buffers", video_buffers);
-
+  bool NewBuffersF(const StreamParser::BufferQueueMap& buffer_queue_map) {
     // 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());
-    }
-    for (const auto& buf : video_buffers) {
-      EXPECT_EQ(video_track_id_, buf->track_id());
+    for (const auto& it : buffer_queue_map) {
+      DVLOG(3) << "Buffers for track_id=" << it.first;
+      for (const auto& buf : it.second) {
+        DVLOG(3) << "  track_id=" << buf->track_id()
+                 << ", size=" << buf->data_size()
+                 << ", pts=" << buf->timestamp().InSecondsF()
+                 << ", dts=" << buf->GetDecodeTimestamp().InSecondsF()
+                 << ", dur=" << buf->duration().InSecondsF();
+        EXPECT_EQ(it.first, buf->track_id());
+      }
     }
 
-    // TODO(wolenetz/acolwell): Add text track support to more MSE parsers. See
-    // http://crbug.com/336926.
-    if (!text_map.empty())
-      return false;
+    const StreamParser::BufferQueue empty_buffers;
+    const auto& itr_audio = buffer_queue_map.find(audio_track_id_);
+    const StreamParser::BufferQueue& audio_buffers =
+        (itr_audio == buffer_queue_map.end()) ? empty_buffers
+                                              : itr_audio->second;
+
+    const auto& itr_video = buffer_queue_map.find(video_track_id_);
+    const StreamParser::BufferQueue& video_buffers =
+        (itr_video == buffer_queue_map.end()) ? empty_buffers
+                                              : itr_video->second;
 
     // Find the second highest timestamp so that we know what the
     // timestamps on the next set of buffers must be >= than.