Changeset 4896 for pjproject/trunk/pjmedia/src/pjmedia-audiodev/android_jni_dev.c

Timestamp:

Aug 20, 2014 12:38:43 PM (10 years ago)

Author:

riza

Message:

Misc (re #1751): fixed sound issue on Android L(using PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI), caused by the difference in JNI array handling. (Thanks Miguel Penades for the report).

File:

• pjproject/trunk/pjmedia/src/pjmedia-audiodev/android_jni_dev.c (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia-audiodev/android_jni_dev.c

@@ -262 +262 @@
         goto on_return;
     }
-    buf = (*jni_env)->GetByteArrayElements(jni_env, inputBuffer, 0);
     
     /* Start recording
@@ -297 +296 @@
         }
 
+        buf = (*jni_env)->GetByteArrayElements(jni_env, inputBuffer, 0);
         frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
         frame.size =  size;
@@ -304 +304 @@
 
         status = (*stream->rec_cb)(stream->user_data, &frame);
+        (*jni_env)->ReleaseByteArrayElements(jni_env, inputBuffer, buf,
+                                             JNI_ABORT);
 
         stream->rec_timestamp.u64 += stream->param.samples_per_frame /
@@ -309 +311 @@
     }
 
-    (*jni_env)->ReleaseByteArrayElements(jni_env, inputBuffer, buf, 0);
     (*jni_env)->DeleteLocalRef(jni_env, inputBuffer);
     
@@ -391 +392 @@
             pj_bzero(frame.buf, frame.size);
         
+        (*jni_env)->ReleaseByteArrayElements(jni_env, outputBuffer, buf,
+                                             JNI_COMMIT);
+
         /* Write to the device output. */
         bytesWritten = (*jni_env)->CallIntMethod(jni_env, stream->track,