diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-13 14:37:57 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-13 14:37:57 -0700 |
| commit | 98159acd68307bf0fcec40ae0fffc1a715517d1d (patch) | |
| tree | 32db1fc8029c7b40c8790b28566f66540e3faefe /media/libstagefright/codecs | |
| parent | 5efa7bf945f53c419501b0a4f9718962f24f0df5 (diff) | |
| parent | 6d72a807dc3910ddd0b7c4f85130951dd189e8f5 (diff) | |
| download | frameworks_av-98159acd68307bf0fcec40ae0fffc1a715517d1d.zip frameworks_av-98159acd68307bf0fcec40ae0fffc1a715517d1d.tar.gz frameworks_av-98159acd68307bf0fcec40ae0fffc1a715517d1d.tar.bz2 | |
Merge "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); |