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

Side by Side 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: incorporate aaron's comments (9/28) Created 7 years, 2 months 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_BASE_TEXT_TRACK_H_ 5 #ifndef MEDIA_BASE_TEXT_TRACK_H_
6 #define MEDIA_BASE_TEXT_TRACK_H_ 6 #define MEDIA_BASE_TEXT_TRACK_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 19 matching lines...) Expand all
30 const std::string& id, 30 const std::string& id,
31 const std::string& content, 31 const std::string& content,
32 const std::string& settings) = 0; 32 const std::string& settings) = 0;
33 }; 33 };
34 34
35 typedef base::Callback<scoped_ptr<TextTrack> 35 typedef base::Callback<scoped_ptr<TextTrack>
36 (TextKind kind, 36 (TextKind kind,
37 const std::string& label, 37 const std::string& label,
38 const std::string& language)> AddTextTrackCB; 38 const std::string& language)> AddTextTrackCB;
39 39
40 class DemuxerStream;
41
42 typedef base::Callback<void
43 (DemuxerStream* text_stream,
44 scoped_ptr<TextTrack>)> AddTextTrackDoneCB;
45
46 // TODO(matthewjheaney): temporary callback name until threading issues
47 // have been settled.
48 typedef base::Callback<void
49 (DemuxerStream* stream,
50 TextKind kind,
51 const std::string& label,
52 const std::string& language,
53 const AddTextTrackDoneCB& done_cb)> AddTextTrackCB2;
54
40 } // namespace media 55 } // namespace media
41 56
42 #endif // MEDIA_BASE_TEXT_TRACK_H_ 57 #endif // MEDIA_BASE_TEXT_TRACK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698