Render inband text tracks in the media pipeline

media/filters/source_buffer_stream.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.
 
 // SourceBufferStream is a data structure that stores media Buffers in ranges.
 // Buffers can be appended out of presentation order. Buffers are retrieved by
 // seeking to the desired start point and calling GetNextBuffer(). Buffers are
 // returned in sequential presentation order.
 
 #ifndef MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_
@@ skipping 31 matching lines @@
     kSuccess,
     kNeedBuffer,
     kConfigChange,
     kEndOfStream
   };
 
   SourceBufferStream(const AudioDecoderConfig& audio_config,
                      const LogCB& log_cb);
   SourceBufferStream(const VideoDecoderConfig& video_config,
                      const LogCB& log_cb);
+  SourceBufferStream(const TextTrackConfig& text_config,
+                     const LogCB& log_cb);
 
   ~SourceBufferStream();
 
   // Signals that the next buffers appended are part of a new media segment
   // starting at |media_segment_start_time|.
   void OnNewMediaSegment(base::TimeDelta media_segment_start_time);
 
   // Add the |buffers| to the SourceBufferStream. Buffers within the queue are
   // expected to be in order, but multiple calls to Append() may add buffers out
   // of order or overlapping. Assumes all buffers within |buffers| are in
@@ skipping 38 matching lines @@
   Ranges<base::TimeDelta> GetBufferedTime() const;
 
   // Notifies this object that end of stream has been signalled.
   void MarkEndOfStream();
 
   // Clear the end of stream state set by MarkEndOfStream().
   void UnmarkEndOfStream();
 
   const AudioDecoderConfig& GetCurrentAudioDecoderConfig();
   const VideoDecoderConfig& GetCurrentVideoDecoderConfig();
+  const TextTrackConfig& GetCurrentTextTrackConfig();
 
   // Notifies this object that the audio config has changed and buffers in
   // future Append() calls should be associated with this new config.
   bool UpdateAudioConfig(const AudioDecoderConfig& config);
 
   // Notifies this object that the video config has changed and buffers in
   // future Append() calls should be associated with this new config.
   bool UpdateVideoConfig(const VideoDecoderConfig& config);
 
   // Returns the largest distance between two adjacent buffers in this stream,
@@ skipping 187 matching lines @@
   // Indicates which decoder config to associate with new buffers
   // being appended. Each new buffer appended has its config ID set
   // to the value of this field.
   int append_config_index_;
 
   // Holds the audio/video configs for this stream. |current_config_index_|
   // and |append_config_index_| represent indexes into one of these vectors.
   std::vector<AudioDecoderConfig> audio_configs_;
   std::vector<VideoDecoderConfig> video_configs_;
 
+  // TODO(matthewjheaney): does this need to be a vector?

[acolwell GONE FROM CHROMIUM, 2013/10/21 20:10:40]

no. since we don't allow config changes on text tracks right now.

[Matthew Heaney (Chromium), 2013/10/23 05:09:01]

Done.

+  TextTrackConfig text_track_config_;
+
   // True if more data needs to be appended before the Seek() can complete,
   // false if no Seek() has been requested or the Seek() is completed.
   bool seek_pending_;
 
   // True if the end of the stream has been signalled.
   bool end_of_stream_;
 
   // Timestamp of the last request to Seek().
   base::TimeDelta seek_buffer_timestamp_;
 
@@ skipping 36 matching lines @@
   // config. GetNextBuffer() must not be called again until
   // GetCurrentXXXDecoderConfig() has been called.
   bool config_change_pending_;
 
   DISALLOW_COPY_AND_ASSIGN(SourceBufferStream);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_