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

Unified Diff: media/webm/webm_stream_parser.h

Issue 13419002: Media Source dispatches inband text tracks (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: clean compile 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/webm/webm_stream_parser.h
diff --git a/media/webm/webm_stream_parser.h b/media/webm/webm_stream_parser.h
index 74075424f4735a19df70f25744f7e80c18230a72..7573782d394b5a06afe4a1158d23b90c9b876ef9 100644
--- a/media/webm/webm_stream_parser.h
+++ b/media/webm/webm_stream_parser.h
@@ -27,6 +27,8 @@ class WebMStreamParser : public StreamParser {
const NewBuffersCB& audio_cb,
const NewBuffersCB& video_cb,
const NeedKeyCB& need_key_cb,
+ const AddTextTrackCB& add_text_track_cb,
+ //const NewBuffersCB& text_cb,
const NewMediaSegmentCB& new_segment_cb,
const base::Closure& end_of_segment_cb,
const LogCB& log_cb) OVERRIDE;
@@ -65,12 +67,25 @@ class WebMStreamParser : public StreamParser {
// Fire needkey event through the |need_key_cb_|.
void FireNeedKey(const std::string& key_id);
+ // To push text track cues up the media stack.
+ void OnTextBuffers(const StreamParser::BufferQueue& buffers,
+ TextTrack* text_cb);
+ void OnTextBuffer(const StreamParserBuffer* buffer,
+ TextTrack* text_cb);
+
State state_;
InitCB init_cb_;
NewConfigCB config_cb_;
NewBuffersCB audio_cb_;
NewBuffersCB video_cb_;
NeedKeyCB need_key_cb_;
+ AddTextTrackCB add_text_track_cb_;
+
+ // TODO(matthewjheaney): my interpretation of Aaron's comments
+ // We also need a ruling about element type: scoped_refptr? etc
acolwell GONE FROM CHROMIUM 2013/05/10 02:22:08 No need for scoped_refptr. You just need to make s
Matthew Heaney (Chromium) 2013/05/10 05:21:08 Done.
+ typedef std::map<int, TextTrack* > TextTrackMap;
+ TextTrackMap text_track_map_;
+
NewMediaSegmentCB new_segment_cb_;
base::Closure end_of_segment_cb_;
LogCB log_cb_;

Powered by Google App Engine
This is Rietveld 408576698