Render inband text tracks in the media pipeline

media/base/text_track.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_TEXT_TRACK_H_
 #define MEDIA_BASE_TEXT_TRACK_H_
 
+#include <map>
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 
 namespace media {
 
 // Specifies the varieties of text tracks.
 enum TextKind {
   kTextSubtitles,
   kTextCaptions,
   kTextDescriptions,
   kTextMetadata,
   kTextNone
 };
 
 class TextTrack {
  public:
   virtual ~TextTrack() {}
   virtual void addWebVTTCue(const base::TimeDelta& start,
                             const base::TimeDelta& end,
                             const std::string& id,
                             const std::string& content,
                             const std::string& settings) = 0;
 };
 
-typedef base::Callback<scoped_ptr<TextTrack>
+typedef base::Callback<void
+    (scoped_ptr<TextTrack>)> AddTextTrackDoneCB;
+
+typedef base::Callback<void
     (TextKind kind,

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

nit: Use const TextTrackConfig& here instead.

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

Done.

      const std::string& label,
-     const std::string& language)> AddTextTrackCB;
+     const std::string& language,
+     const AddTextTrackDoneCB& done_cb)> AddTextTrackCB;
+
+class TextTrackConfig {
+ public:
+  TextTrackConfig();
+  TextTrackConfig(TextKind kind,
+                  const std::string& label,
+                  const std::string& language);
+
+  // Returns true if all fields in |config| match this config.
+  bool Matches(const TextTrackConfig& config) const;
+

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

Add kind(), label(), language() accessors.

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

Done.

+ private:
+  TextKind kind_;
+  std::string label_;
+  std::string language_;
+};
+
+typedef std::map<int, TextTrackConfig> TextTrackConfigMap;
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_TEXT_TRACK_H_