Return buffers from StreamParsers in a single unified map

media/base/stream_parser.h

 // Copyright (c) 2012 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_BASE_STREAM_PARSER_H_
 #define MEDIA_BASE_STREAM_PARSER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 21 matching lines @@
 // Abstract interface for parsing media byte streams.
 class MEDIA_EXPORT StreamParser {
  public:
   using BufferQueue = std::deque<scoped_refptr<StreamParserBuffer>>;
 
   // Range of |TrackId| is dependent upon stream parsers. It is currently
   // the key for the buffer's text track config in the applicable
   // TextTrackConfigMap (which is passed in StreamParser::NewConfigCB), or
   // 0 for other media types that currently allow at most one track.
   // WebMTracksParser uses -1 as an invalid text track number.
-  // TODO(wolenetz/acolwell): Change to size_type while fixing stream parsers to
-  // emit validated track configuration and buffer vectors rather than max 1
-  // audio, max 1 video, and N text tracks in a map keyed by
-  // bytestream-specific-ranged track numbers. See http://crbug.com/341581.
+  // It is also the key for BufferQueueMap structure returned by stream parsers.
+  // TODO(servolk/wolenetz): Change to size_type or unsigned after fixing track
+  // id handling in FrameProcessor.
   typedef int TrackId;
 
   // Map of text track ID to the track configuration.
   typedef std::map<TrackId, TextTrackConfig> TextTrackConfigMap;
 
-  // Map of text track ID to decode-timestamp-ordered buffers for the track.
-  typedef std::map<TrackId, const BufferQueue> TextBufferQueueMap;
+  // Map of track ID to decode-timestamp-ordered buffers for the track.
+  using BufferQueueMap = std::map<TrackId, BufferQueue>;
 
   // Stream parameters passed in InitCB.
   struct MEDIA_EXPORT InitParameters {
     InitParameters(base::TimeDelta duration);
 
     // Stream duration.
     base::TimeDelta duration;
 
     // Indicates the source time associated with presentation timestamp 0. A
     // null Time is returned if no mapping to Time exists.
@@ skipping 24 matching lines @@
   // Second parameter - The new text tracks configuration.  If the map is empty,
   //                    then no text tracks were parsed for use from the stream.
   // Return value - True if the new configurations are accepted.
   //                False if the new configurations are not supported
   //                and indicates that a parsing error should be signalled.
   typedef base::Callback<bool(std::unique_ptr<MediaTracks>,
                               const TextTrackConfigMap&)>
       NewConfigCB;
 
   // New stream buffers have been parsed.
-  // First parameter - A queue of newly parsed audio buffers.
-  // Second parameter - A queue of newly parsed video buffers.
-  // Third parameter - A map of text track ids to queues of newly parsed inband
-  //                   text buffers. If the map is not empty, it must contain
-  //                   at least one track with a non-empty queue of text
-  //                   buffers.
+  // First parameter - A map of track ids to queues of newly parsed buffers.
   // Return value - True indicates that the buffers are accepted.
   //                False if something was wrong with the buffers and a parsing
   //                error should be signalled.
-  typedef base::Callback<bool(const BufferQueue&,
-                              const BufferQueue&,
-                              const TextBufferQueueMap&)> NewBuffersCB;
+  typedef base::Callback<bool(const BufferQueueMap&)> NewBuffersCB;
 
   // Signals the beginning of a new media segment.
   typedef base::Callback<void()> NewMediaSegmentCB;
 
   // Signals the end of a media segment.
   typedef base::Callback<void()> EndMediaSegmentCB;
 
   // A new potentially encrypted stream has been parsed.
   // First parameter - The type of the initialization data associated with the
   //                   stream.
@@ skipping 38 matching lines @@
 // Any previous contents of |merged_buffers| is assumed to have lower
 // decode timestamps versus the provided buffers. All provided buffer queues
 // are assumed to already be in decode-timestamp order.
 // Returns false if any of the provided audio/video/text buffers are found
 // to not be in decode timestamp order, or have a decode timestamp less than
 // the last buffer, if any, in |merged_buffers|. Partial results may exist
 // in |merged_buffers| in this case. Returns true on success.
 // No validation of media type within the various buffer queues is done here.
 // TODO(wolenetz/acolwell): Merge incrementally in parsers to eliminate
 // subtle issues with tie-breaking. See http://crbug.com/338484.
-MEDIA_EXPORT bool MergeBufferQueues(
-    const StreamParser::BufferQueue& audio_buffers,
-    const StreamParser::BufferQueue& video_buffers,
-    const StreamParser::TextBufferQueueMap& text_buffers,
-    StreamParser::BufferQueue* merged_buffers);
+MEDIA_EXPORT bool MergeBufferQueues(const StreamParser::BufferQueueMap& buffers,
+                                    StreamParser::BufferQueue* merged_buffers);
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_STREAM_PARSER_H_