Fixed AudioTransportSource buffer reading

Author: devopvoid

webrtc-jni/src/main/cpp/src/JNI_AudioProcessing.cpp

@@ -72,7 +72,7 @@ JNIEXPORT jint JNICALL Java_dev_onvoid_webrtc_media_audio_AudioProcessing_proces
 	jbyte * srcPtr = env->GetByteArrayElements(src, nullptr);
 	jbyte * dstPtr = env->GetByteArrayElements(dest, &isDstCopy);
 
-	int result = apm->ProcessStream(reinterpret_cast<int16_t *>(srcPtr), srcConfig, dstConfig, reinterpret_cast<int16_t *>(dstPtr));
+	int result = apm->ProcessStream(reinterpret_cast<const int16_t *>(srcPtr), srcConfig, dstConfig, reinterpret_cast<int16_t *>(dstPtr));
 
 	if (isDstCopy == JNI_TRUE) {
 		jsize dstLength = env->GetArrayLength(dest);

webrtc-jni/src/main/cpp/src/media/audio/AudioTransportSource.cpp

@@ -39,19 +39,30 @@ namespace jni
 	{
 		JNIEnv * env = AttachCurrentThread();
 
-		const jbyte * buffer = static_cast<const jbyte *>(audioSamples);
-		jbyteArray dataArray = env->NewByteArray(0);
+		jsize bufferSize = nSamples * nBytesPerSample;
+		jbyteArray dataArray = env->NewByteArray(bufferSize);
+		jsize bufferLength = env->GetArrayLength(dataArray);
 
 		*elapsed_time_ms = 0;
 		*ntp_time_ms = 0;
 
+		if (bufferLength < bufferSize) {
+			env->DeleteLocalRef(dataArray);
+			return 0;
+		}
+
 		nSamplesOut = env->CallIntMethod(source, javaClass->onPlaybackData, dataArray, nSamples, nBytesPerSample, nChannels, samplesPerSec);
 
-		if (nSamplesOut < nSamples) {
-			// EOF. Fill with silence.
-			nSamplesOut = nSamples * nChannels;
+		if (nSamplesOut > 0) {
+			jbyte * buf = env->GetByteArrayElements(dataArray, NULL);
 
-			std::memset(audioSamples, 0, nSamples * nBytesPerSample);
+			std::memcpy(audioSamples, buf, bufferSize);
+
+			env->ReleaseByteArrayElements(dataArray, buf, JNI_ABORT);
+		}
+		else if (nSamplesOut < nSamples) {
+			// EOF. Fill with silence.
+			std::memset(audioSamples, 0, bufferSize);
 		}
 
 		return 0;