Basic media tracks implementation for media stream parsers

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>
 
 #include <deque>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/eme_constants.h"
 #include "media/base/media_export.h"
 #include "media/base/media_log.h"
 
 namespace media {
 
-class AudioDecoderConfig;
+class MediaTracks;
 class StreamParserBuffer;
 class TextTrackConfig;
-class VideoDecoderConfig;
 
 // Abstract interface for parsing media byte streams.
 class MEDIA_EXPORT StreamParser {
  public:
   typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
 
   // 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.
@@ skipping 27 matching lines @@
 
     // Indicates live stream.
     DemuxerStream::Liveness liveness;
   };
 
   // Indicates completion of parser initialization.
   //   params - Stream parameters.
   typedef base::Callback<void(const InitParameters& params)> InitCB;
 
   // Indicates when new stream configurations have been parsed.
-  // First parameter - The new audio configuration. If the config is not valid
-  //                   then it means that there isn't an audio stream.
-  // Second parameter - The new video configuration. If the config is not valid
-  //                    then it means that there isn't an audio stream.
-  // Third parameter - The new text tracks configuration.  If the map is empty,
-  //                   then no text tracks were parsed from the stream.
+  // First parameter - An object containing information about media tracks as
+  //                   well as audio/video decoder configs associated with each
+  //                   track.
+  // Second parameter - The new text tracks configuration.  If the map is empty,
+  //                    then no text tracks were parsed 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(const AudioDecoderConfig&,
-                              const VideoDecoderConfig&,
-                              const TextTrackConfigMap&)> NewConfigCB;
+  typedef base::Callback<bool(scoped_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.
   // Return value - True indicates that the buffers are accepted.
   //                False if something was wrong with the buffers and a parsing
@@ skipping 61 matching lines @@
 // 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_