diff options
| author | matthewjheaney@chromium.org <matthewjheaney@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-08 02:20:25 +0000 |
|---|---|---|
| committer | matthewjheaney@chromium.org <matthewjheaney@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-08 02:20:25 +0000 |
| commit | 4d5a0faa1170057dbbb6caabca181cd648adea24 (patch) | |
| tree | 86c723d9321fee8fb92910d6fa6b4c7ad550cd79 /media/webm/webm_stream_parser.cc | |
| parent | 8c711adfd9e9d958c078488526d901963478d1aa (diff) | |
| download | chromium_src-4d5a0faa1170057dbbb6caabca181cd648adea24.zip chromium_src-4d5a0faa1170057dbbb6caabca181cd648adea24.tar.gz chromium_src-4d5a0faa1170057dbbb6caabca181cd648adea24.tar.bz2 | |
media source should ignore subtitles in webm files
BUG=167152
Review URL: https://chromiumcodereview.appspot.com/11635058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/webm/webm_stream_parser.cc')
| -rw-r--r-- | media/webm/webm_stream_parser.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/webm/webm_stream_parser.cc b/media/webm/webm_stream_parser.cc index 02c1357..db854a9 100644 --- a/media/webm/webm_stream_parser.cc +++ b/media/webm/webm_stream_parser.cc @@ -294,6 +294,7 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) { case kWebMIdVoid: case kWebMIdCRC32: case kWebMIdCues: + case kWebMIdChapters: if (cur_size < (result + element_size)) { // We don't have the whole element yet. Signal we need more data. return 0; @@ -395,6 +396,7 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) { info_parser.timecode_scale(), tracks_parser.audio_track_num(), tracks_parser.video_track_num(), + tracks_parser.text_tracks(), tracks_parser.ignored_tracks(), tracks_parser.audio_encryption_key_id(), tracks_parser.video_encryption_key_id(), @@ -424,7 +426,8 @@ int WebMStreamParser::ParseCluster(const uint8* data, int size) { if (id == kWebMIdCluster) waiting_for_buffers_ = true; - if (id == kWebMIdCues) { + // TODO(matthewjheaney): implement support for chapters + if (id == kWebMIdCues || id == kWebMIdChapters) { if (size < (result + element_size)) { // We don't have the whole element yet. Signal we need more data. return 0; |