summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-08-18 14:21:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-18 14:21:51 -0700
commitc7dbac57e29cd563b11e82740c3fb557d47907ac (patch)
tree8aeb9b9dc378e1281cff53893ef8fca88e8bd1a6 /media
parent1944cca612b491db147b86bbd637e5ebaf3e8c9a (diff)
parent31eb1ac1db38d0a5cd0b44dd5251941992f74b58 (diff)
downloadframeworks_base-c7dbac57e29cd563b11e82740c3fb557d47907ac.zip
frameworks_base-c7dbac57e29cd563b11e82740c3fb557d47907ac.tar.gz
frameworks_base-c7dbac57e29cd563b11e82740c3fb557d47907ac.tar.bz2
am 31eb1ac1: am 0324ce9a: Merge "Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us." into gingerbread
Merge commit '31eb1ac1db38d0a5cd0b44dd5251941992f74b58' * commit '31eb1ac1db38d0a5cd0b44dd5251941992f74b58': Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us.
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/MPEG4Extractor.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 6af3a7f..12a1e6e 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1273,6 +1273,14 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio(
hexdump(csd, csd_size);
#endif
+ if (csd_size == 0) {
+ // There's no further information, i.e. no codec specific data
+ // Let's assume that the information provided in the mpeg4 headers
+ // is accurate and hope for the best.
+
+ return OK;
+ }
+
if (csd_size < 2) {
return ERROR_MALFORMED;
}