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

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: rebase Created 7 years, 7 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 a5fd6f0abcde8d78d54994a7d87279c62356d90d..249f22bf2c0d3b12051ead698b76c0dbb11e84c9 100644
--- a/media/filters/chunk_demuxer.h
+++ b/media/filters/chunk_demuxer.h
@@ -15,6 +15,7 @@
#include "media/base/demuxer.h"
#include "media/base/ranges.h"
#include "media/base/stream_parser.h"
+#include "media/base/text_track.h"
#include "media/filters/source_buffer_stream.h"
namespace media {
@@ -41,9 +42,13 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
// is ready to receive media data via AppenData().
// |need_key_cb| Run when the demuxer determines that an encryption key is
// needed to decrypt the content.
+ // |add_text_track_cb| Run when demuxer detects the presence of an inband
+ // text track.
// |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,
+ ChunkDemuxer(const base::Closure& open_cb,
+ const NeedKeyCB& need_key_cb,
+ const AddTextTrackCB& add_text_track_cb,
const LogCB& log_cb);
virtual ~ChunkDemuxer();
@@ -134,6 +139,8 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
const VideoDecoderConfig& video_config);
bool OnAudioBuffers(const StreamParser::BufferQueue& buffers);
bool OnVideoBuffers(const StreamParser::BufferQueue& buffers);
+ bool OnTextBuffers(TextTrack* text_track,
+ const StreamParser::BufferQueue& buffers);
bool OnNeedKey(const std::string& type,
scoped_ptr<uint8[]> init_data,
int init_data_size);
@@ -175,6 +182,7 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
DemuxerHost* host_;
base::Closure open_cb_;
NeedKeyCB need_key_cb_;
+ AddTextTrackCB add_text_track_cb_;
// 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