diff options
| author | Andreas Huber <andih@google.com> | 2013-02-27 20:13:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-02-27 20:13:25 +0000 |
| commit | d166e4c1b2463a1aa78ca9225a36aa956427446b (patch) | |
| tree | 2020e9b5a3aca0085006b587a72607e1a7634717 /media | |
| parent | 25e964bc9cfbb8ed315f75ac1e05cbc3c6cd9fc2 (diff) | |
| parent | d13e6d06ecbbad0fcd7681f9d3c3b076016339aa (diff) | |
| download | frameworks_av-d166e4c1b2463a1aa78ca9225a36aa956427446b.zip frameworks_av-d166e4c1b2463a1aa78ca9225a36aa956427446b.tar.gz frameworks_av-d166e4c1b2463a1aa78ca9225a36aa956427446b.tar.bz2 | |
Merge "SoftAMR: Signal the right frame format"
Diffstat (limited to 'media')
| -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; |