From 08c94b265c4bf7105b593afb119053a2e16865e9 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Wed, 18 Aug 2010 09:58:30 -0700 Subject: 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. Change-Id: Ia29b967cbee9eabb21c6c26508b27b379ff9ba17 --- media/libstagefright/MPEG4Extractor.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) 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; } -- cgit v1.1