We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch for SDL_android.cpp

SDL_android.patch (text/plain), 5.07 KB, created by Bill_Chenbin on 2011-10-10 22:34:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill_Chenbin

Created: 2011-10-10 22:34:11 UTC

Size: 5.07 KB

patch

obsolete

>diff --git a/jni/libsdl/SDL/src/core/android/SDL_android.cpp b/jni/libsdl/SDL/src/core/android/SDL_android.cpp
>index 94f1a4d..df50591 100755
>--- a/jni/libsdl/SDL/src/core/android/SDL_android.cpp
>+++ b/jni/libsdl/SDL/src/core/android/SDL_android.cpp
>@@ -29,6 +29,15 @@ extern "C" {
> #include "../../video/android/SDL_androidtouch.h"
> #include "../../video/android/SDL_androidvideo.h"
> 
>+#include <android/log.h>
>+#define LOG_TAG "SDL_android"
>+#define LOGI(...)  __android_log_print(ANDROID_LOG_INFO,LOG_TAG,__VA_ARGS__)
>+#define LOGE(...)  __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)
>+
>+
>+#undef printf
>+#define printf LOGI
>+
> /* Impelemented in audio/android/SDL_androidaudio.c */
> extern void Android_RunAudioThread();
> } // C
>@@ -45,6 +54,7 @@ extern void Android_RunAudioThread();
> *******************************************************************************/
> static JNIEnv* mEnv = NULL;
> static JNIEnv* mAudioEnv = NULL;
>+static JavaVM* mJavaVM;
> 
> // Main activity
> static jclass mActivityClass;
>@@ -68,6 +78,14 @@ static float fLastAccelerometer[3];
> // Library init
> extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved)
> {
>+    JNIEnv *env;
>+    mJavaVM = vm;
>+    LOGI("JNI_OnLoad called");
>+    if (mJavaVM->GetEnv((void**) &env, JNI_VERSION_1_4) != JNI_OK) {
>+        LOGE("Failed to get the environment using GetEnv()");
>+        return -1;
>+    }
>+
>     return JNI_VERSION_1_4;
> }
> 
>@@ -96,6 +114,7 @@ extern "C" void SDL_Android_Init(JNIEnv* env, jclass cls)
>        !midAudioWriteShortBuffer || !midAudioWriteByteBuffer || !midAudioQuit) {
>         __android_log_print(ANDROID_LOG_WARN, "SDL", "SDL: Couldn't locate Java callbacks, check that they're named and typed correctly");
>     }
>+    __android_log_print(ANDROID_LOG_INFO, "SDL", "SDL_Android_Init() finished!");
> }
> 
> // Resize
>@@ -203,30 +222,49 @@ extern "C" int Android_JNI_OpenAudioDevice(int sampleRate, int is16Bit, int chan
> {
>     int audioBufferFrames;
> 
>+    int status;
>+    JNIEnv *env;
>+    static bool isAttached = false;    
>+    status = mJavaVM->GetEnv((void **) &env, JNI_VERSION_1_4);
>+    if(status < 0) {
>+        LOGE("callback_handler: failed to get JNI environment, "
>+        "assuming native thread");
>+        status = mJavaVM->AttachCurrentThread(&env, NULL);
>+        if(status < 0) {
>+            LOGE("callback_handler: failed to attach "
>+            "current thread");
>+            return 0;
>+        }
>+        isAttached = true;
>+    }
>+
>+    
>     __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "SDL audio: opening device");
>     audioBuffer16Bit = is16Bit;
>     audioBufferStereo = channelCount > 1;
> 
>-    audioBuffer = mEnv->CallStaticObjectMethod(mActivityClass, midAudioInit, sampleRate, audioBuffer16Bit, audioBufferStereo, desiredBufferFrames);
>+    audioBuffer = env->CallStaticObjectMethod(mActivityClass, midAudioInit, sampleRate, audioBuffer16Bit, audioBufferStereo, desiredBufferFrames);
>+    //audioBuffer = NULL;
> 
>     if (audioBuffer == NULL) {
>         __android_log_print(ANDROID_LOG_WARN, "SDL", "SDL audio: didn't get back a good audio buffer!");
>         return 0;
>     }
>-    audioBuffer = mEnv->NewGlobalRef(audioBuffer);
>+    audioBuffer = env->NewGlobalRef(audioBuffer);
> 
>     jboolean isCopy = JNI_FALSE;
>     if (audioBuffer16Bit) {
>-        audioBufferPinned = mEnv->GetShortArrayElements((jshortArray)audioBuffer, &isCopy);
>-        audioBufferFrames = mEnv->GetArrayLength((jshortArray)audioBuffer);
>+        audioBufferPinned = env->GetShortArrayElements((jshortArray)audioBuffer, &isCopy);
>+        audioBufferFrames = env->GetArrayLength((jshortArray)audioBuffer);
>     } else {
>-        audioBufferPinned = mEnv->GetByteArrayElements((jbyteArray)audioBuffer, &isCopy);
>-        audioBufferFrames = mEnv->GetArrayLength((jbyteArray)audioBuffer);
>+        audioBufferPinned = env->GetByteArrayElements((jbyteArray)audioBuffer, &isCopy);
>+        audioBufferFrames = env->GetArrayLength((jbyteArray)audioBuffer);
>     }
>     if (audioBufferStereo) {
>         audioBufferFrames /= 2;
>     }
>-
>+ 
>+    if(isAttached) mJavaVM->DetachCurrentThread();
>     return audioBufferFrames;
> }
> 
>@@ -250,13 +288,30 @@ extern "C" void Android_JNI_WriteAudioBuffer()
> 
> extern "C" void Android_JNI_CloseAudioDevice()
> {
>-    mEnv->CallStaticVoidMethod(mActivityClass, midAudioQuit); 
>+    int status;
>+    JNIEnv *env;
>+    static bool isAttached = false;    
>+    status = mJavaVM->GetEnv((void **) &env, JNI_VERSION_1_4);
>+    if(status < 0) {
>+        LOGE("callback_handler: failed to get JNI environment, "
>+        "assuming native thread");
>+        status = mJavaVM->AttachCurrentThread(&env, NULL);
>+        if(status < 0) {
>+            LOGE("callback_handler: failed to attach "
>+            "current thread");
>+            return;
>+        }
>+        isAttached = true;
>+    }
>+
>+    env->CallStaticVoidMethod(mActivityClass, midAudioQuit); 
> 
>     if (audioBuffer) {
>-        mEnv->DeleteGlobalRef(audioBuffer);
>+        env->DeleteGlobalRef(audioBuffer);
>         audioBuffer = NULL;
>         audioBufferPinned = NULL;
>     }
>+    if(isAttached) mJavaVM->DetachCurrentThread();
> }
> 
> static int Android_JNI_FileOpen(SDL_RWops* ctx)

Actions: View | Diff

Attachments on bug 1312: 711

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.