Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '0324ce9a1e21ed66e00d6560c27a6faf6d151f68' into gingerbread-plus-aosp

* commit '0324ce9a1e21ed66e00d6560c27a6faf6d151f68':
  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.
This commit is contained in:
Andreas Huber
2010-08-18 13:38:49 -07:00
committed by Android Git Automerger
parent 0899e8bc9d 0324ce9a1e
commit 31eb1ac1db
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/libstagefright/MPEG4Extractor.cpp
View File

@@ -1273,6 +1273,14 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio(
hexdump(csd, csd_size); hexdump(csd, csd_size);
#endif #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) { if (csd_size < 2) {
return ERROR_MALFORMED; return ERROR_MALFORMED;
} }