diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-13 10:53:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-13 10:53:51 -0700 |
| commit | 10004fe612bc38bedc258fd1c380ebccacfa0c1e (patch) | |
| tree | 17b3ce288cb1221b7ace4540766ba4168aa0c3df /media | |
| parent | 3ca352c4cd01f6df3b691f835efc68a5771e724e (diff) | |
| parent | 5efa7bf945f53c419501b0a4f9718962f24f0df5 (diff) | |
| download | frameworks_av-10004fe612bc38bedc258fd1c380ebccacfa0c1e.zip frameworks_av-10004fe612bc38bedc258fd1c380ebccacfa0c1e.tar.gz frameworks_av-10004fe612bc38bedc258fd1c380ebccacfa0c1e.tar.bz2 | |
am 5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip"
* commit '5efa7bf945f53c419501b0a4f9718962f24f0df5':
amrnb: Fix audio distortion in an AMR-NB clip
Diffstat (limited to 'media')
| -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. */ |