Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0324ce9a authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Be more lenient when validating ESDS information in mp4 audio tracks.... 

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
parents baf3869b 08c94b26

media/libstagefright/MPEG4Extractor.cpp

+8 −0
Original line number Diff line number Diff line
@@ -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;

    }