diff options
| author | Martin Storsjo <martin@martin.st> | 2013-02-17 20:36:45 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2013-02-17 20:39:14 +0200 |
| commit | d13e6d06ecbbad0fcd7681f9d3c3b076016339aa (patch) | |
| tree | a5c638186a606ed74ec62e10ac64ab9bb5083bca /media/libstagefright/codecs | |
| parent | 9a6c614a68b07209919aaea3d4a8b5403379fb35 (diff) | |
| download | frameworks_av-d13e6d06ecbbad0fcd7681f9d3c3b076016339aa.zip frameworks_av-d13e6d06ecbbad0fcd7681f9d3c3b076016339aa.tar.gz frameworks_av-d13e6d06ecbbad0fcd7681f9d3c3b076016339aa.tar.bz2 | |
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
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp b/media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp index c5f733b..4d4212f 100644 --- a/media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp +++ b/media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp @@ -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; |