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

Commit ab639fac authored by Dheeraj Sharma's avatar Dheeraj Sharma Committed by Android (Google) Code Review
Browse files

Merge "VideoEditor:Fix for 3384150 and 3369908" into honeycomb

parents 52897c2f ec380153

libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp

+6 −3
Original line number Diff line number Diff line
@@ -438,7 +438,8 @@ M4OSA_ERR VideoEditorAudioDecoder_create(M4AD_Type decoderType, 
            mime = MEDIA_MIMETYPE_AUDIO_AMR_NB;

            // Engine parameters

            pDecoderContext->mAudioStreamHandler->m_byteFrameLength = 160;

            pDecoderContext->mAudioStreamHandler->m_byteSampleSize = 16;

            // Number of bytes per sample

            pDecoderContext->mAudioStreamHandler->m_byteSampleSize = 2;

            pDecoderContext->mAudioStreamHandler->m_samplingFrequency = 8000;

            pDecoderContext->mAudioStreamHandler->m_nbChannels = 1;

            break;
@@ -448,7 +449,8 @@ M4OSA_ERR VideoEditorAudioDecoder_create(M4AD_Type decoderType, 
            mime = MEDIA_MIMETYPE_AUDIO_AMR_WB;



            pDecoderContext->mAudioStreamHandler->m_byteFrameLength = 160;

            pDecoderContext->mAudioStreamHandler->m_byteSampleSize = 16;

            // Number of bytes per sample

            pDecoderContext->mAudioStreamHandler->m_byteSampleSize = 2;

            pDecoderContext->mAudioStreamHandler->m_samplingFrequency = 16000;

            pDecoderContext->mAudioStreamHandler->m_nbChannels = 1;

            break;
@@ -476,7 +478,8 @@ M4OSA_ERR VideoEditorAudioDecoder_create(M4AD_Type decoderType, 


            VIDEOEDITOR_CHECK(M4NO_ERROR == err, err);

            pDecoderContext->mAudioStreamHandler->m_byteFrameLength = 1024;

            pDecoderContext->mAudioStreamHandler->m_byteSampleSize = 16;

            // Number of bytes per sample

            pDecoderContext->mAudioStreamHandler->m_byteSampleSize = 2;

            pDecoderContext->mAudioStreamHandler->m_samplingFrequency =

                aacProperties.aSampFreq;

            pDecoderContext->mAudioStreamHandler->m_nbChannels =