Render inband text tracks in the media pipeline

media/webm/webm_tracks_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_TRACKS_PARSER_H_
 #define MEDIA_WEBM_WEBM_TRACKS_PARSER_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/media_log.h"
-#include "media/base/text_track.h"
+#include "media/base/text_track_config.h"
 #include "media/base/video_decoder_config.h"
 #include "media/webm/webm_audio_client.h"
 #include "media/webm/webm_content_encodings_client.h"
 #include "media/webm/webm_parser.h"
 #include "media/webm/webm_video_client.h"
 
 namespace media {
 
 // Parser for WebM Tracks element.
 class MEDIA_EXPORT WebMTracksParser : public WebMParserClient {
@@ skipping 21 matching lines @@
   }
 
   const std::string& video_encryption_key_id() const {
     return video_encryption_key_id_;
   }
 
   const VideoDecoderConfig& video_decoder_config() {
     return video_decoder_config_;
   }
 
-  struct TextTrackInfo {
-    TextKind kind;
-    std::string name;
-    std::string language;
-  };
-
-  typedef std::map<int64, TextTrackInfo> TextTracks;
+  typedef std::map<int, TextTrackConfig> TextTracks;
 
   const TextTracks& text_tracks() const {
     return text_tracks_;
   }
 
  private:
   // WebMParserClient implementation.
   virtual WebMParserClient* OnListStart(int id) OVERRIDE;
   virtual bool OnListEnd(int id) OVERRIDE;
   virtual bool OnUInt(int id, int64 val) OVERRIDE;
@@ skipping 25 matching lines @@
 
   WebMVideoClient video_client_;
   VideoDecoderConfig video_decoder_config_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMTracksParser);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_WEBM_WEBM_TRACKS_PARSER_H_