Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1215)

Unified Diff: media/base/text_track.h

Issue 23702007: Render inband text tracks in the media pipeline (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix compile errors 11/21 #6 Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/text_renderer_unittest.cc ('k') | media/base/text_track_config.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/text_track.h
diff --git a/media/base/text_track.h b/media/base/text_track.h
index 01a2ed727f90bc3ce9880796185b9ab782536c5d..0e04a0eb46dab94db2290c73df6cf4b3f6293492 100644
--- a/media/base/text_track.h
+++ b/media/base/text_track.h
@@ -13,14 +13,7 @@
namespace media {
-// Specifies the varieties of text tracks.
-enum TextKind {
- kTextSubtitles,
- kTextCaptions,
- kTextDescriptions,
- kTextMetadata,
- kTextNone
-};
+class TextTrackConfig;
class TextTrack {
public:
@@ -32,10 +25,12 @@ class TextTrack {
const std::string& settings) = 0;
};
-typedef base::Callback<scoped_ptr<TextTrack>
- (TextKind kind,
- const std::string& label,
- const std::string& language)> AddTextTrackCB;
+typedef base::Callback<void
+ (scoped_ptr<TextTrack>)> AddTextTrackDoneCB;
+
+typedef base::Callback<void
+ (const TextTrackConfig& config,
+ const AddTextTrackDoneCB& done_cb)> AddTextTrackCB;
} // namespace media
« no previous file with comments | « media/base/text_renderer_unittest.cc ('k') | media/base/text_track_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698