Return buffers from StreamParsers in a single unified map

media/filters/frame_processor.h

 // 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.
 
 #ifndef MEDIA_FILTERS_FRAME_PROCESSOR_H_
 #define MEDIA_FILTERS_FRAME_PROCESSOR_H_
 
 #include <map>
 
 #include "base/callback_forward.h"
@@ skipping 26 matching lines @@
   FrameProcessor(const UpdateDurationCB& update_duration_cb,
                  const scoped_refptr<MediaLog>& media_log);
   ~FrameProcessor();
 
   // Get/set the current append mode, which if true means "sequence" and if
   // false means "segments".
   // See http://www.w3.org/TR/media-source/#widl-SourceBuffer-mode.
   bool sequence_mode() { return sequence_mode_; }
   void SetSequenceMode(bool sequence_mode);
 
-  // Processes buffers in |audio_buffers|, |video_buffers|, and |text_map|.
+  // Processes buffers in |buffer_queue_map|.
   // Returns true on success or false on failure which indicates decode error.
   // |append_window_start| and |append_window_end| correspond to the MSE spec's
   // similarly named source buffer attributes that are used in coded frame
   // processing.
   // Uses |*timestamp_offset| according to the coded frame processing algorithm,
   // including updating it as required in 'sequence' mode frame processing.
-  bool ProcessFrames(const StreamParser::BufferQueue& audio_buffers,
-                     const StreamParser::BufferQueue& video_buffers,
-                     const StreamParser::TextBufferQueueMap& text_map,
+  bool ProcessFrames(const StreamParser::BufferQueueMap& buffer_queue_map,
                      base::TimeDelta append_window_start,
                      base::TimeDelta append_window_end,
                      base::TimeDelta* timestamp_offset);
 
   // Signals the frame processor to update its group start timestamp to be
   // |timestamp_offset| if it is in sequence append mode.
   void SetGroupStartTimestampIfInSequenceMode(base::TimeDelta timestamp_offset);
 
   // Adds a new track with unique track ID |id|.
   // If |id| has previously been added, returns false to indicate error.
@@ skipping 115 matching lines @@
   // Counters that limit spam to |media_log_| for frame processor warnings.
   int num_dropped_preroll_warnings_ = 0;
   int num_dts_beyond_pts_warnings_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(FrameProcessor);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FRAME_PROCESSOR_H_