summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2013-02-27 20:13:24 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-02-27 20:13:25 +0000
commitceb83b8d8919dc778402bf610c073987d4f9f89b (patch)
tree84198308f5db6262b1222f0e0fd3d6eb8f220637
parentccf51ec41652a7e2db8cbee37bca91a95908d5ff (diff)
parent8298cd4d7e99648f277215bf981fdef78bc19e45 (diff)
Merge "SoftAMR: Signal the right frame format"
-rw-r--r--media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp2
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 c5f733b3..4d4212f1 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;