diff options
author | Insun Kang <insun@google.com> | 2012-09-25 20:22:25 +0900 |
---|---|---|
committer | James Dong <jdong@google.com> | 2013-01-17 14:33:21 -0800 |
commit | 034566c1bb1a71d38399c930cd1b206880605458 (patch) | |
tree | 2750fb9765d50c01e89238b440af4af8ee1335f6 /media/libstagefright/timedtext/TimedTextSRTSource.cpp | |
parent | 45490af027a15af9fe0fdfca21f423c74cd8e4e9 (diff) | |
download | frameworks_av-034566c1bb1a71d38399c930cd1b206880605458.zip frameworks_av-034566c1bb1a71d38399c930cd1b206880605458.tar.gz frameworks_av-034566c1bb1a71d38399c930cd1b206880605458.tar.bz2 |
Bug fix: set 'und' as default metadata language info for srt.
o Previously, it leaves language code empty and it is inconsistent with
other code which gives 'und'. As a result, selected SRT track returned
empty language info. With this fix, it returns 'und'.
Bug: 7227230
TESTED=runtest -d cts-media -c android.media.cts.MediaPlayerTest -m
testGetTrackInfo
Change-Id: I225848f029637dd782c376e0d770dddd5c849550
Diffstat (limited to 'media/libstagefright/timedtext/TimedTextSRTSource.cpp')
-rw-r--r-- | media/libstagefright/timedtext/TimedTextSRTSource.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/media/libstagefright/timedtext/TimedTextSRTSource.cpp b/media/libstagefright/timedtext/TimedTextSRTSource.cpp index eac23ba..2ac1e72 100644 --- a/media/libstagefright/timedtext/TimedTextSRTSource.cpp +++ b/media/libstagefright/timedtext/TimedTextSRTSource.cpp @@ -36,6 +36,9 @@ TimedTextSRTSource::TimedTextSRTSource(const sp<DataSource>& dataSource) : mSource(dataSource), mMetaData(new MetaData), mIndex(0) { + // TODO: Need to detect the language, because SRT doesn't give language + // information explicitly. + mMetaData->setCString(kKeyMediaLanguage, "und"); } TimedTextSRTSource::~TimedTextSRTSource() { @@ -46,14 +49,10 @@ status_t TimedTextSRTSource::start() { if (err != OK) { reset(); } - // TODO: Need to detect the language, because SRT doesn't give language - // information explicitly. - mMetaData->setCString(kKeyMediaLanguage, ""); return err; } void TimedTextSRTSource::reset() { - mMetaData->clear(); mTextVector.clear(); mIndex = 0; } |