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

Commit a6fa59c6 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Fix for 5477832 Movie Studio crash when trying to import the attached... 

Merge "Fix for 5477832 Movie Studio crash when trying to import the attached h263 file." into ics-mr0
parents c65d276d 799de64f

libvideoeditor/vss/mcs/src/M4MCS_API.c

+7 −0
Original line number Diff line number Diff line
@@ -10575,6 +10575,13 @@ M4OSA_ERR M4MCS_intCheckAndGetCodecProperties( 
                    pC->pReaderAudioStream,

                    pC->m_pCurrentAudioDecoderUserData);

    }

    if (M4NO_ERROR != err) {



        M4OSA_TRACE1_1(

            "M4MCS_intCheckAndGetCodecProperties: m_pFctCreateAudioDec \

             returns 0x%x", err);

        return err;

    }



    pC->m_pAudioDecoder->m_pFctSetOptionAudioDec(pC->pAudioDecCtxt,

           M4AD_kOptionID_3gpReaderInterface, (M4OSA_DataOption) pC->m_pReaderDataIt);

libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp

+11 −0
Original line number Diff line number Diff line
@@ -341,9 +341,20 @@ M4OSA_ERR VideoEditorAudioDecoder_parse_AAC_DSI(M4OSA_Int8* pDSI, 
    VIDEOEDITOR_CHECK(M4NO_ERROR == err, err);

    switch( result ) {

        case 2:

            /* Audio Object Type is 2 (AAC Low Complexity) */

            pProperties->aPSPresent  = 0;

            pProperties->aSBRPresent = 0;

            break;

        case 5:

            /* Audio Object Type is 5 (Spectral Band Replication) */

            pProperties->aPSPresent  = 0;

            pProperties->aSBRPresent = 1;

            break;

        case 29:

            /* Audio Object Type is 29 (Parametric Stereo) */

            pProperties->aPSPresent  = 1;

            pProperties->aSBRPresent = 1;

            break;

        default:

            LOGV("parse_AAC_DSI ERROR : object type %d is not supported",

                result);