Return buffers from StreamParsers in a single unified map

media/filters/frame_processor.cc

Index: media/filters/frame_processor.cc
diff --git a/media/filters/frame_processor.cc b/media/filters/frame_processor.cc
index e85a7d088f8c959b98e15f899fa5d455ef6081fc..13dba12964dc789fb745a9d5db72dabfab8e9476 100644
--- a/media/filters/frame_processor.cc
+++ b/media/filters/frame_processor.cc
@@ -196,14 +196,12 @@ void FrameProcessor::SetSequenceMode(bool sequence_mode) {
 }
 
 bool FrameProcessor::ProcessFrames(
-    const StreamParser::BufferQueue& audio_buffers,
-    const StreamParser::BufferQueue& video_buffers,
-    const StreamParser::TextBufferQueueMap& text_map,
+    const StreamParser::BufferQueueMap& buffer_queue_map,
     base::TimeDelta append_window_start,
     base::TimeDelta append_window_end,
     base::TimeDelta* timestamp_offset) {
   StreamParser::BufferQueue frames;
-  if (!MergeBufferQueues(audio_buffers, video_buffers, text_map, &frames)) {
+  if (!MergeBufferQueues(buffer_queue_map, &frames)) {
     MEDIA_LOG(ERROR, media_log_) << "Parsed buffers not in DTS sequence";
     return false;
   }