open/vlc-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aout: fix memleak

Browse Source 
close() is not called in the same thread than open()
DetachCurrentThread() worked though (did it do nothing?)
This commit is contained in:
Rafaël Carré
2012-01-21 03:17:33 -05:00
parent 56c7f07367
commit 57ca66712e
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vlc-android/jni/aout.c
View File

@@ -20,8 +20,6 @@ typedef struct
jobject j_libVlc; /// Pointer to the LibVLC Java object
jmethodID play; /// Java method to play audio buffers
jbyteArray buffer; /// Raw audio data to be played
JNIEnv *p_env; ///< Main thread environment: this is NOT the
/// play thread! See comments in aout_play()
} aout_sys_t;
/** Unique Java VM instance, as defined in libvlcjni.c */
@@ -41,14 +39,12 @@ int aout_open(void **opaque, char *format, unsigned *rate, unsigned *nb_channels
LOGI ("Parameters: %u channels, FOURCC '%4.4s', sample rate: %uHz",
*nb_channels, format, *rate);
// Attach the thread to the VM. Keep this JNIEnv for aout_close()
JNIEnv *p_env;
if ((*myVm)->AttachCurrentThread (myVm, &p_env, NULL) != 0)
{
LOGE("Couldn't attach the display thread to the JVM !");
return -1;
}
p_sys->p_env = p_env;
// Call the init function.
jclass cls = (*p_env)->GetObjectClass (p_env, p_sys->j_libVlc);
@@ -100,6 +96,7 @@ int aout_open(void **opaque, char *format, unsigned *rate, unsigned *nb_channels
// Get the play methodId
p_sys->play = (*p_env)->GetMethodID (p_env, cls, "playAudio", "([BI)V");
assert (p_sys->play != NULL);
(*myVm)->DetachCurrentThread (myVm);
return 0;
error:
@@ -152,9 +149,9 @@ void aout_close(void *opaque)
assert(p_sys);
assert(p_sys->buffer);
// Want a crash? Call this function! But whyyyyy???
// Anyway, one more good reason to create the buffer in pure Java
//(*p_sys->p_env)->DeleteGlobalRef (p_sys->p_env, p_sys->buffer);
JNIEnv *p_env;
(*myVm)->AttachCurrentThread (myVm, &p_env, NULL);
(*p_env)->DeleteGlobalRef (p_env, p_sys->buffer);
(*myVm)->DetachCurrentThread (myVm);
free (p_sys);
}