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

Commit d13e6d06 authored by Martin Storsjo's avatar Martin Storsjo
Browse files

SoftAMR: Signal the right frame format 

The correct enum for the format used is OMX_AUDIO_AMRFrameFormatFSF,
which is the same as is used in amrnb/enc/SoftAMRNBEncoder.cpp,
amrwbenc/SoftAMRWBEncoder.cpp and in OMXCodec and ACodec.

The OMX_AUDIO_AMRFrameFormatConformance enum refers to an odd file
format only used for conformance tests, not used in the wild.

Change-Id: Idc395fc1d4969e33453522d6ec6526876438c526
parent 9a6c614a

media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ OMX_ERRORTYPE SoftAMR::internalGetParameter( 


            amrParams->nChannels = 1;

            amrParams->eAMRDTXMode = OMX_AUDIO_AMRDTXModeOff;

            amrParams->eAMRFrameFormat = OMX_AUDIO_AMRFrameFormatConformance;

            amrParams->eAMRFrameFormat = OMX_AUDIO_AMRFrameFormatFSF;



            if (!isConfigured()) {

                amrParams->nBitRate = 0;