#include <deque>
#include <map>
#include <string>
+#include <vector>
#include "base/callback_forward.h"
#include "base/memory/ref_counted.h"
public:
typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
- // Map of text track number to the track configuration.
- typedef std::map<int, TextTrackConfig> TextTrackConfigMap;
+ // 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.
+ typedef int TrackId;
- // Map of text track number to decode-timestamp-ordered buffers for the track.
- typedef std::map<int, const BufferQueue> TextBufferQueueMap;
+ // Map of text track ID to the track configuration.
+ typedef std::map<TrackId, TextTrackConfig> TextTrackConfigMap;
- StreamParser();
- virtual ~StreamParser();
+ // Map of text track ID to decode-timestamp-ordered buffers for the track.
+ typedef std::map<TrackId, const BufferQueue> TextBufferQueueMap;
+
+ // Stream parameters passed in InitCB.
+ struct 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.
+ base::Time timeline_offset;
+
+ // Indicates that timestampOffset should be updated based on the earliest
+ // end timestamp (audio or video) provided during each NewBuffersCB.
+ bool auto_update_timestamp_offset;
+
+ // Indicates live stream.
+ Demuxer::Liveness liveness;
+ };
// Indicates completion of parser initialization.
- // First parameter - Indicates initialization success. Set to true if
- // initialization was successful. False if an error
- // occurred.
- // Second parameter - Indicates the stream duration. Only contains a valid
- // value if the first parameter is true.
- typedef base::Callback<void(bool, base::TimeDelta)> InitCB;
+ // success - True if initialization was successful.
+ // params - Stream parameters, in case of successful initialization.
+ typedef base::Callback<void(bool success,
+ const InitParameters& params)> InitCB;
// Indicates when new stream configurations have been parsed.
// First parameter - The new audio configuration. If the config is not valid
typedef base::Callback<void(const std::string&,
const std::vector<uint8>&)> NeedKeyCB;
+ StreamParser();
+ virtual ~StreamParser();
+
// Initializes the parser with necessary callbacks. Must be called before any
// data is passed to Parse(). |init_cb| will be called once enough data has
// been parsed to determine the initial stream configurations, presentation
DISALLOW_COPY_AND_ASSIGN(StreamParser);
};
+// Appends to |merged_buffers| the provided buffers in decode-timestamp order.
+// 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);
+
} // namespace media
#endif // MEDIA_BASE_STREAM_PARSER_H_