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

Unified Diff: webkit/media/webmediaplayer_impl.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: webkit/media/webmediaplayer_impl.h
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index 3772a8bd17e95a4844da117c1c1f1ceb4c80a7eb..ac3fe35742ed5a6708bd52739c1835eef93c832e 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -31,6 +31,7 @@
#include "media/base/audio_renderer_sink.h"
#include "media/base/decryptor.h"
#include "media/base/pipeline.h"
+#include "media/base/text_track.h"
#include "media/filters/gpu_video_decoder.h"
#include "media/filters/skcanvas_video_renderer.h"
#include "skia/ext/platform_canvas.h"
@@ -55,6 +56,7 @@ namespace media {
class ChunkDemuxer;
class FFmpegDemuxer;
class MediaLog;
+class TextTrack;
}
namespace webkit {
@@ -68,6 +70,7 @@ class MediaStreamClient;
class WebAudioSourceProviderImpl;
class WebMediaPlayerDelegate;
class WebMediaPlayerParams;
+class WebTextTrackImpl;
class WebMediaPlayerImpl
: public WebKit::WebMediaPlayer,
@@ -209,6 +212,11 @@ class WebMediaPlayerImpl
const std::string& session_id,
scoped_ptr<uint8[]> init_data,
int init_data_size);
+
+ // TODO(matthewjheaney): need ruling about this return type
+ media::TextTrack* OnTextTrack(media::TextKind kind,
acolwell GONE FROM CHROMIUM 2013/05/10 02:22:08 scoped_ptr<TextTrack>
Matthew Heaney (Chromium) 2013/05/10 05:21:08 Done.
+ const std::string& label,
+ const std::string& language);
void SetOpaque(bool);
private:
@@ -369,6 +377,10 @@ class WebMediaPlayerImpl
// not NULL while the compositor is actively using this webmediaplayer.
cc::VideoFrameProvider::Client* video_frame_provider_client_;
+ // TODO(matthewjheaney): must resolve ptr type, and lifetime issues
+ //std::set<WebTextTrackImpl*> text_tracks_;
+ int text_track_index_;
+
DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
};

Powered by Google App Engine
This is Rietveld 408576698