commit 09aec82f0d2c244d1c06d2180e0e469afc0403fd
author Ricardo Garcia <rago@google.com> Mon Sep 11 17:17:25 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 11 17:17:25 2023 +0000
tree 4439b5067867f2bfe48e2fd2b596aae77dab28e4
parent 9d41c7035f0b36d665672d6bd1fff21a45c48b48
parent 3780ebacad165114c623cc46fb3430b39d9c84e1

Upgrade sonic to 9a8d05dc0baa9159fc322dd9905a04e23b161337 am: 3780ebacad

Original change: https://android-review.googlesource.com/c/platform/external/sonic/+/2745925

Change-Id: Ie2c76c43d3ae77b088bd0838d8b99877da69f927
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

METADATA

diff --git a/METADATA b/METADATA
index c531560..a800c58 100644
--- a/METADATA
+++ b/METADATA
@@ -1,19 +1,19 @@
 # This project was upgraded with external_updater.
 # Usage: tools/external_updater/updater.sh update sonic
-# For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md
+# For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md
 
 name: "sonic"
 description: "Sonic is a simple algorithm for speeding up or slowing down speech."
 third_party {
   url {
     type: ARCHIVE
-    value: "https://github.com/waywardgeek/sonic/archive/0555641f2d7e52a3d1720b4ae5affb5d50bdde23.zip"
+    value: "https://github.com/waywardgeek/sonic/archive/9a8d05dc0baa9159fc322dd9905a04e23b161337.zip"
   }
-  version: "0555641f2d7e52a3d1720b4ae5affb5d50bdde23"
+  version: "9a8d05dc0baa9159fc322dd9905a04e23b161337"
   license_type: NOTICE
   last_upgrade_date {
     year: 2023
-    month: 5
-    day: 3
+    month: 9
+    day: 9
   }
 }

sonic.c

diff --git a/sonic.c b/sonic.c
index 27fcaff..c18fc6e 100644
--- a/sonic.c
+++ b/sonic.c
@@ -391,7 +391,7 @@
   /* Allocate 25% more than needed so we hopefully won't grow. */
   stream->pitchBufferSize = maxRequired + (maxRequired >> 2);
   stream->pitchBuffer =
-      (short*)sonicCalloc(maxRequired, sizeof(short) * numChannels);
+      (short*)sonicCalloc(stream->pitchBufferSize, sizeof(short) * numChannels);
   if (stream->pitchBuffer == NULL) {
     sonicDestroyStream(stream);
     return 0;
@@ -887,15 +887,12 @@
                                        int originalNumOutputSamples) {
   int numSamples = stream->numOutputSamples - originalNumOutputSamples;
   int numChannels = stream->numChannels;
+  int pitchBufferSize = stream->pitchBufferSize;
 
-  if (stream->numPitchSamples + numSamples > stream->pitchBufferSize) {
-    int pitchBufferSize = stream->pitchBufferSize;
+  if (stream->numPitchSamples + numSamples > pitchBufferSize) {
     stream->pitchBufferSize += (pitchBufferSize >> 1) + numSamples;
-    stream->pitchBuffer = (short*)sonicRealloc(
-        stream->pitchBuffer,
-        pitchBufferSize,
-        stream->pitchBufferSize,
-        sizeof(short) * numChannels);
+    stream->pitchBuffer = (short*)sonicRealloc(stream->pitchBuffer,
+        pitchBufferSize, stream->pitchBufferSize, sizeof(short) * numChannels);
   }
   memcpy(stream->pitchBuffer + stream->numPitchSamples * numChannels,
          stream->outputBuffer + originalNumOutputSamples * numChannels,