diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-13 16:03:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-13 16:03:31 -0700 |
| commit | 93b68548124ec9b01b9bf4ddf010afa06a503547 (patch) | |
| tree | fb890460f999c97d6375954a07f3890b5c5ac60e /media/libstagefright/codecs | |
| parent | 106e8a42038f9e90d5ff97f8ab6f1a42258bde9e (diff) | |
| parent | 979df012eb0588ac7f87d5f6e8bff77e2049ee46 (diff) | |
| download | frameworks_av-93b68548124ec9b01b9bf4ddf010afa06a503547.zip frameworks_av-93b68548124ec9b01b9bf4ddf010afa06a503547.tar.gz frameworks_av-93b68548124ec9b01b9bf4ddf010afa06a503547.tar.bz2 | |
am 979df012: am 98159acd: Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"
* commit '979df012eb0588ac7f87d5f6e8bff77e2049ee46':
amrnb: Restart the p_xn pointer when retraversing the array on overflow
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/amrnb/enc/src/g_pitch.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/amrnb/enc/src/g_pitch.cpp b/media/libstagefright/codecs/amrnb/enc/src/g_pitch.cpp index f6235ad..5b80e2a 100644 --- a/media/libstagefright/codecs/amrnb/enc/src/g_pitch.cpp +++ b/media/libstagefright/codecs/amrnb/enc/src/g_pitch.cpp @@ -400,8 +400,9 @@ Word16 G_pitch( /* o : Gain of pitch lag saturated to 1.2 */ } else { - s = 0; /* Avoid case of all zeros */ + s = 0; /* re-initialize calculations */ p_y1 = &y1[0]; + p_xn = &xn[0]; for (i = (L_subfr >> 2); i != 0; i--) { L_temp = (Word32)(*(p_y1++) >> 2); |