diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-13 10:58:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-13 10:58:48 -0700 |
| commit | f64f9b2dd0e0582442fb2bd04296f7d64c55140d (patch) | |
| tree | d862c8a9dc8a7e71754d5e01abec6d7a8439c7a5 | |
| parent | 73247cac58b0c295e02b2350722699689ac45189 (diff) | |
| parent | 8cf9c1a8640553a146f3a7aad01b393c664a46af (diff) | |
| download | frameworks_av-f64f9b2dd0e0582442fb2bd04296f7d64c55140d.zip frameworks_av-f64f9b2dd0e0582442fb2bd04296f7d64c55140d.tar.gz frameworks_av-f64f9b2dd0e0582442fb2bd04296f7d64c55140d.tar.bz2 | |
am 8cf9c1a8: am 10004fe6: am 5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip"
* commit '8cf9c1a8640553a146f3a7aad01b393c664a46af':
amrnb: Fix audio distortion in an AMR-NB clip
| -rw-r--r-- | media/libstagefright/codecs/amrnb/dec/src/post_pro.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/amrnb/dec/src/post_pro.cpp b/media/libstagefright/codecs/amrnb/dec/src/post_pro.cpp index ce31793..8201e54 100644 --- a/media/libstagefright/codecs/amrnb/dec/src/post_pro.cpp +++ b/media/libstagefright/codecs/amrnb/dec/src/post_pro.cpp @@ -376,7 +376,7 @@ void Post_Process( L_tmp += ((Word32) st->x0) * c_b0; L_tmp += ((Word32) st->x1) * c_b1; L_tmp += ((Word32) x2) * c_b2; - L_tmp <<= 3; + L_tmp = L_shl(L_tmp, 3, pOverflow); /* Multiplication by two of output speech with saturation. */ |