diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-13 11:01:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-13 11:01:00 -0700 |
| commit | 38b8d56d63b38e539daa44292ae3e01633c99fef (patch) | |
| tree | f66f1a04a491bbd82ae2b8ed161b940bf40f1753 | |
| parent | 4fc9d476db8ba59053deac76dce9f403c34a0f2d (diff) | |
| parent | f64f9b2dd0e0582442fb2bd04296f7d64c55140d (diff) | |
| download | frameworks_av-38b8d56d63b38e539daa44292ae3e01633c99fef.zip frameworks_av-38b8d56d63b38e539daa44292ae3e01633c99fef.tar.gz frameworks_av-38b8d56d63b38e539daa44292ae3e01633c99fef.tar.bz2 | |
am f64f9b2d: am 8cf9c1a8: am 10004fe6: am 5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip"
* commit 'f64f9b2dd0e0582442fb2bd04296f7d64c55140d':
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. */ |