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

Unified Diff: media/filters/chunk_demuxer.h

Issue 13419002: Media Source dispatches inband text tracks (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: media/filters/chunk_demuxer.h
diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h
index f2b5062fff82388e9a7e8d806bd2b50f5a0f326d..9c32e5298ae1f5f3800c3d13228cb0bb54cdf84b 100644
--- a/media/filters/chunk_demuxer.h
+++ b/media/filters/chunk_demuxer.h
@@ -36,6 +36,9 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
scoped_array<uint8> init_data,
int init_data_size)> NeedKeyCB;
+ // TODO(matthewjheaney): temp hack to test cue rendering
fgalligan1 2013/04/02 19:38:32 What is the TODO? Remove temp hack to test cue ren
Matthew Heaney (Chromium) 2013/04/04 04:01:52 Augmented the comment.
+ typedef base::Callback<void(const base::TimeDelta& time)> TextCB;
+
// |open_cb| Run when Initialize() is called to signal that the demuxer
// is ready to receive media data via AppenData().
// |need_key_cb| Run when the demuxer determines that an encryption key is
@@ -43,6 +46,9 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
// |log_cb| Run when parsing error messages need to be logged to the error
// console.
ChunkDemuxer(const base::Closure& open_cb, const NeedKeyCB& need_key_cb,
+ const TextTrackCB& text_track_cb,
+ // TODO(matthewjheaney): temp hack to text cue rendering
+ const TextCB& text_cb,
const LogCB& log_cb);
// Demuxer implementation.
@@ -139,6 +145,7 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
bool OnNeedKey(const std::string& type,
scoped_array<uint8> init_data,
int init_data_size);
+ bool OnTextBuffers(const StreamParser::BufferQueue& buffers);
void OnNewMediaSegment(const std::string& source_id,
base::TimeDelta start_timestamp);
void OnEndOfMediaSegment(const std::string& source_id);
@@ -178,6 +185,8 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
DemuxerHost* host_;
base::Closure open_cb_;
NeedKeyCB need_key_cb_;
+ TextTrackCB text_track_cb_;
+ TextCB text_cb_; // TODO(matthewjheaney): temp hack to test cue rendering
// Callback used to report error strings that can help the web developer
// figure out what is wrong with the content.
LogCB log_cb_;

Powered by Google App Engine
This is Rietveld 408576698