diff options
| author | Leena Winterrowd <lenhardw@codeaurora.org> | 2014-03-31 16:56:13 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:24:07 -0600 |
| commit | fb0040833c39c77312ceacf83f3454bbaef28c9d (patch) | |
| tree | 169a70b63fa305375e51e3561ead58008d7c1cb8 /media/libstagefright/StagefrightMetadataRetriever.cpp | |
| parent | 8ce0b472a64ee74f08ecc73501ece6c19599d0a4 (diff) | |
| download | frameworks_av-fb0040833c39c77312ceacf83f3454bbaef28c9d.zip frameworks_av-fb0040833c39c77312ceacf83f3454bbaef28c9d.tar.gz frameworks_av-fb0040833c39c77312ceacf83f3454bbaef28c9d.tar.bz2 | |
stagefright: Handle missing text track language
Only set timed text language if kKeyMediaLanguage is found.
Crs-Fixed: 641896
Change-Id: Ie471bc458e42f5728064e447ac5c33b07311d3fd
Diffstat (limited to 'media/libstagefright/StagefrightMetadataRetriever.cpp')
| -rw-r--r-- | media/libstagefright/StagefrightMetadataRetriever.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp index be28821..376463d 100644 --- a/media/libstagefright/StagefrightMetadataRetriever.cpp +++ b/media/libstagefright/StagefrightMetadataRetriever.cpp @@ -665,9 +665,12 @@ void StagefrightMetadataRetriever::parseMetaData() { } } else if (!strcasecmp(mime, MEDIA_MIMETYPE_TEXT_3GPP)) { const char *lang; - trackMeta->findCString(kKeyMediaLanguage, &lang); - timedTextLang.append(String8(lang)); - timedTextLang.append(String8(":")); + if (trackMeta->findCString(kKeyMediaLanguage, &lang)) { + timedTextLang.append(String8(lang)); + timedTextLang.append(String8(":")); + } else { + ALOGE("No language found for timed text"); + } } } } |