diff options
| author | matthewjheaney@chromium.org <matthewjheaney@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-22 01:19:31 +0000 |
|---|---|---|
| committer | matthewjheaney@chromium.org <matthewjheaney@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-22 01:19:31 +0000 |
| commit | 8a5610641873c139760a68ab3bd05e20e62df3ae (patch) | |
| tree | 793df094179d5c9db661876e62a17cd9ca0e750b /media/base/media_log.cc | |
| parent | 49728365a1847baa284259504aaade201bfdccb7 (diff) | |
| download | chromium_src-8a5610641873c139760a68ab3bd05e20e62df3ae.zip chromium_src-8a5610641873c139760a68ab3bd05e20e62df3ae.tar.gz chromium_src-8a5610641873c139760a68ab3bd05e20e62df3ae.tar.bz2 | |
Render inband text tracks in the media pipeline
This change modifies the FFmpeg demuxer to recognize text
streams embedded in the source media (Webm). Text decoder
and text renderer filters have been added to the pipeline,
to process the text frames as they are pulled downstream.
BUG=230708
Review URL: https://codereview.chromium.org/23702007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236660 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/media_log.cc')
| -rw-r--r-- | media/base/media_log.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/base/media_log.cc b/media/base/media_log.cc index 8a07b02..e791b44 100644 --- a/media/base/media_log.cc +++ b/media/base/media_log.cc @@ -50,6 +50,8 @@ const char* MediaLog::EventTypeToString(MediaLogEvent::Type type) { return "AUDIO_ENDED"; case MediaLogEvent::VIDEO_ENDED: return "VIDEO_ENDED"; + case MediaLogEvent::TEXT_ENDED: + return "TEXT_ENDED"; case MediaLogEvent::AUDIO_RENDERER_DISABLED: return "AUDIO_RENDERER_DISABLED"; case MediaLogEvent::BUFFERED_EXTENTS_CHANGED: |