commit d166e4c1b2463a1aa78ca9225a36aa956427446b
author Andreas Huber <andih@google.com> Wed Feb 27 20:13:24 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 27 20:13:25 2013 +0000
tree 2020e9b5a3aca0085006b587a72607e1a7634717
parent 25e964bc9cfbb8ed315f75ac1e05cbc3c6cd9fc2
parent d13e6d06ecbbad0fcd7681f9d3c3b076016339aa

Merge "SoftAMR: Signal the right frame format"

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

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 @@
 
             amrParams->nChannels = 1;
             amrParams->eAMRDTXMode = OMX_AUDIO_AMRDTXModeOff;
-            amrParams->eAMRFrameFormat = OMX_AUDIO_AMRFrameFormatConformance;
+            amrParams->eAMRFrameFormat = OMX_AUDIO_AMRFrameFormatFSF;
 
             if (!isConfigured()) {
                 amrParams->nBitRate = 0;