diff options
author | Insun Kang <insun@google.com> | 2011-11-10 16:11:26 +0900 |
---|---|---|
committer | Insun Kang <insun@google.com> | 2011-11-10 16:41:04 +0900 |
commit | e26dd87f87be5016777bf92e498a26d545d3926a (patch) | |
tree | b09ec0ce82e790debd7ec952b97c1b65de4cd854 /media/libstagefright | |
parent | 32beb277bc4d71cb587258e8195dcbca2da84ed9 (diff) | |
download | frameworks_av-e26dd87f87be5016777bf92e498a26d545d3926a.zip frameworks_av-e26dd87f87be5016777bf92e498a26d545d3926a.tar.gz frameworks_av-e26dd87f87be5016777bf92e498a26d545d3926a.tar.bz2 |
Adds handler type 'sbtl' to support subtitles in various containers.
Change-Id: I16d2c5d9aeb087b958e28052f266ca0ef42ea7f1
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index adec997..1b286fa 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1336,8 +1336,9 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { uint32_t type = ntohl(buffer); // For the 3GPP file format, the handler-type within the 'hdlr' box - // shall be 'text' - if (type == FOURCC('t', 'e', 'x', 't')) { + // shall be 'text'. We also want to support 'sbtl' handler type + // for a practical reason as various MPEG4 containers use it. + if (type == FOURCC('t', 'e', 'x', 't') || type == FOURCC('s', 'b', 't', 'l')) { mLastTrack->meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_TEXT_3GPP); } |