Render inband text tracks in the media pipeline

media/webm/webm_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_WEBM_WEBM_STREAM_PARSER_H_
 #define MEDIA_WEBM_WEBM_STREAM_PARSER_H_
 
-#include <map>
-
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/buffers.h"
 #include "media/base/byte_queue.h"
 #include "media/base/stream_parser.h"
 #include "media/base/video_decoder_config.h"
 
 namespace media {
 
 class WebMClusterParser;
 
 class WebMStreamParser : public StreamParser {
  public:
   WebMStreamParser();
   virtual ~WebMStreamParser();
 
   // StreamParser implementation.
   virtual void Init(const InitCB& init_cb, const NewConfigCB& config_cb,
                     const NewBuffersCB& new_buffers_cb,
                     const NewTextBuffersCB& text_cb,
                     const NeedKeyCB& need_key_cb,
-                    const AddTextTrackCB& add_text_track_cb,
+                    bool enable_text_tracks,

[acolwell GONE FROM CHROMIUM, 2013/10/24 18:57:51]

WDYT about just making text_cb null if text tracks aren't enabled? That would
avoid the need for this extra parameter and also make it impossible for the
parser to transmit text buffers if text tracks are disabled.

[Matthew Heaney (Chromium), 2013/10/25 03:05:38]

Done.

                     const NewMediaSegmentCB& new_segment_cb,
                     const base::Closure& end_of_segment_cb,
                     const LogCB& log_cb) OVERRIDE;
   virtual void Flush() OVERRIDE;
   virtual bool Parse(const uint8* buf, int size) OVERRIDE;
 
  private:
   enum State {
     kWaitingForInit,
     kParsingHeaders,
@@ skipping 24 matching lines @@
 
   // Fire needkey event through the |need_key_cb_|.
   void FireNeedKey(const std::string& key_id);
 
   State state_;
   InitCB init_cb_;
   NewConfigCB config_cb_;
   NewBuffersCB new_buffers_cb_;
   NewTextBuffersCB text_cb_;
   NeedKeyCB need_key_cb_;
-  AddTextTrackCB add_text_track_cb_;
-
-  typedef std::map<int, TextTrack* > TextTrackMap;
-  TextTrackMap text_track_map_;
+  bool enable_text_tracks_;
 
   NewMediaSegmentCB new_segment_cb_;
   base::Closure end_of_segment_cb_;
   LogCB log_cb_;
 
   // True if a new cluster id has been seen, but no audio or video buffers have
   // been parsed yet.
   bool waiting_for_buffers_;
 
   scoped_ptr<WebMClusterParser> cluster_parser_;
   ByteQueue byte_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMStreamParser);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_WEBM_WEBM_STREAM_PARSER_H_