From a17a16eda2d7c0fd9d729dcd9d416f17fa285527 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 25 May 2013 12:11:06 -0700 Subject: [PATCH] Avoid a memory copy when audio is ahead. --- android/app-android.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/android/app-android.cpp b/android/app-android.cpp index 210fa34a8a..2d9a7dc322 100644 --- a/android/app-android.cpp +++ b/android/app-android.cpp @@ -306,8 +306,13 @@ extern "C" jint Java_com_henrikrydgard_libnative_NativeApp_audioRender(JNIEnv* e short *data = env->GetShortArrayElements(array, 0); int samples = buf_size / 2; samples = NativeMix(data, samples); - env->ReleaseShortArrayElements(array, data, 0); - return samples * 2; + if (samples != 0) { + env->ReleaseShortArrayElements(array, data, 0); + return samples * 2; + } else { + env->ReleaseShortArrayElements(array, data, JNI_ABORT); + return 0; + } } return 0; }