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 | 8298cd4d7e99648f277215bf981fdef78bc19e45 (patch) | |
| tree | 35aae19be3c9cc90b9aaecd0d3b793c6abfdac1b | |
| parent | c3afe5591a5c3a1aaf1cdcdeded75f6cff931569 (diff) | |
| download | frameworks_av-8298cd4d7e99648f277215bf981fdef78bc19e45.zip frameworks_av-8298cd4d7e99648f277215bf981fdef78bc19e45.tar.gz frameworks_av-8298cd4d7e99648f277215bf981fdef78bc19e45.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
| -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; |