diff options
| author | Andreas Huber <andih@google.com> | 2010-10-04 11:26:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-04 11:26:16 -0700 |
| commit | 0074d69add482a351b4e0004d62b1cb8ed475505 (patch) | |
| tree | 07624bc79143ac6f9b5148fc43ce70c427eec63f /media/libstagefright/AwesomePlayer.cpp | |
| parent | 0d14c25355b7807b88fcdc76040ef986aa754815 (diff) | |
| parent | 66e3c30dc6c6e46bd56cb3dcd9fbd732c517a887 (diff) | |
| download | frameworks_av-0074d69add482a351b4e0004d62b1cb8ed475505.zip frameworks_av-0074d69add482a351b4e0004d62b1cb8ed475505.tar.gz frameworks_av-0074d69add482a351b4e0004d62b1cb8ed475505.tar.bz2 | |
am bb506dab: am 7fa69374: Merge "Don\'t retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread
Merge commit 'bb506dab1ff10e6939fcd0457571e0b46793dd80'
* commit 'bb506dab1ff10e6939fcd0457571e0b46793dd80':
Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.
Diffstat (limited to 'media/libstagefright/AwesomePlayer.cpp')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 8e50d39..e72f28e 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -320,11 +320,17 @@ status_t AwesomePlayer::setDataSource_l(const sp<MediaExtractor> &extractor) { setAudioSource(extractor->getTrack(i)); haveAudio = true; - sp<MetaData> fileMeta = extractor->getMetaData(); - int32_t loop; - if (fileMeta != NULL - && fileMeta->findInt32(kKeyAutoLoop, &loop) && loop != 0) { - mFlags |= AUTO_LOOPING; + if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_VORBIS)) { + // Only do this for vorbis audio, none of the other audio + // formats even support this ringtone specific hack and + // retrieving the metadata on some extractors may turn out + // to be very expensive. + sp<MetaData> fileMeta = extractor->getMetaData(); + int32_t loop; + if (fileMeta != NULL + && fileMeta->findInt32(kKeyAutoLoop, &loop) && loop != 0) { + mFlags |= AUTO_LOOPING; + } } } |