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

Unified Diff: content/renderer/media/webmediaplayer_impl.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 (10/12) 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/webmediaplayer_impl.h
diff --git a/content/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h
index 85e93d708dfe36c8396fe9101f85677c9ccd731a..5e55ce092a52a18d59e4f552ca5a7bdedda49a55 100644
--- a/content/renderer/media/webmediaplayer_impl.h
+++ b/content/renderer/media/webmediaplayer_impl.h
@@ -55,7 +55,7 @@ class MessageLoopProxy;
namespace media {
class ChunkDemuxer;
-class FFmpegDemuxer;
+class DemuxerStream;
acolwell GONE FROM CHROMIUM 2013/10/14 20:42:24 nit: not needed.
Matthew Heaney (Chromium) 2013/10/17 05:46:44 Done.
class GpuVideoAcceleratorFactories;
class MediaLog;
}
@@ -196,9 +196,11 @@ class WebMediaPlayerImpl
const std::string& default_url);
void OnNeedKey(const std::string& type,
const std::vector<uint8>& init_data);
- scoped_ptr<media::TextTrack> OnTextTrack(media::TextKind kind,
- const std::string& label,
- const std::string& language);
+ void OnAddTextTrack(media::TextKind kind,
+ const std::string& label,
+ const std::string& language,
+ const media::AddTextTrackDoneCB& done_cb);
+
void SetOpaque(bool);
private:

Powered by Google App Engine
This is Rietveld 408576698