Return buffers from StreamParsers in a single unified map

media/filters/frame_processor.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/filters/frame_processor.h"
 
 #include <stdint.h>
 
 #include <cstdlib>
 
@@ skipping 178 matching lines @@
     // We're switching from 'sequence' to 'segments' mode. Be safe and signal a
     // new coded frame group on the next frame emitted.
     coded_frame_group_last_dts_ = kNoDecodeTimestamp();
   }
 
   // Step 8: Update the attribute to new mode.
   sequence_mode_ = 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;
   }
 
   DCHECK(!frames.empty());
 
   // Implements the coded frame processing algorithm's outer loop for step 1.
   // Note that ProcessFrame() implements an inner loop for a single frame that
   // handles "jump to the Loop Top step to restart processing of the current
   // coded frame" per June 9, 2016 MSE spec editor's draft:
@@ skipping 542 matching lines @@
     // Step 21 is currently handled differently. See MediaSourceState's
     // |auto_update_timestamp_offset_|.
     return true;
   }
 
   NOTREACHED();
   return false;
 }
 
 }  // namespace media