remove redundant functions

ijkmedia/ijksdl/android/ijksdl_android_jni.c

@@ -99,27 +99,6 @@ void SDL_JNI_DetachThreadEnv()
     return;
 }
 
-jboolean SDL_JNI_RethrowException(JNIEnv *env)
-{
-    if ((*env)->ExceptionCheck(env)) {
-        (*env)->ExceptionDescribe(env);
-        return JNI_TRUE;
-    }
-
-    return JNI_FALSE;
-}
-
-jboolean SDL_JNI_CatchException(JNIEnv *env)
-{
-    if ((*env)->ExceptionCheck(env)) {
-        (*env)->ExceptionDescribe(env);
-        (*env)->ExceptionClear(env);
-        return JNI_TRUE;
-    }
-
-    return JNI_FALSE;
-}
-
 int SDL_JNI_ThrowException(JNIEnv* env, const char* className, const char* msg)
 {
     if ((*env)->ExceptionCheck(env)) {
@@ -164,7 +143,7 @@ jobject SDL_JNI_NewObjectAsGlobalRef(JNIEnv *env, jclass clazz, jmethodID method
 
     jobject global_object = NULL;
     jobject local_object = (*env)->NewObjectV(env, clazz, methodID, args);
-    if (!SDL_JNI_RethrowException(env) && local_object) {
+    if (!JJK_ExceptionCheck__throwAny(env) && local_object) {
         global_object = (*env)->NewGlobalRef(env, local_object);
         SDL_JNI_DeleteLocalRefP(env, &local_object);
     }

ijkmedia/ijksdl/android/ijksdl_codec_android_mediacodec_java.c

@@ -132,7 +132,7 @@ static sdl_amedia_status_t SDL_AMediaCodecJava_configure_surface(
     jobject android_media_codec  = SDL_AMediaCodecJava_getObject(env, acodec);
     ALOGE("configure acodec:%p format:%p: surface:%p", android_media_codec, android_media_format, android_surface);
     JJKC_MediaCodec__configure(env, android_media_codec, android_media_format, android_surface, crypto, flags);
-    if (SDL_JNI_CatchException(env)) {
+    if (JJK_ExceptionCheck__catchAll(env)) {
         return SDL_AMEDIA_ERROR_UNKNOWN;
     }
 
@@ -154,7 +154,7 @@ static sdl_amedia_status_t SDL_AMediaCodecJava_start(SDL_AMediaCodec* acodec)
     SDL_AMediaCodec_Opaque *opaque = (SDL_AMediaCodec_Opaque *)acodec->opaque;
     jobject android_media_codec    = opaque->android_media_codec;
     JJKC_MediaCodec__start(env, android_media_codec);
-    if (SDL_JNI_CatchException(env)) {
+    if (JJK_ExceptionCheck__catchAll(env)) {
         ALOGE("%s: start failed", __func__);
         return SDL_AMEDIA_ERROR_UNKNOWN;
     }
@@ -174,7 +174,7 @@ static sdl_amedia_status_t SDL_AMediaCodecJava_stop(SDL_AMediaCodec* acodec)
 
     jobject android_media_codec = SDL_AMediaCodecJava_getObject(env, acodec);
     JJKC_MediaCodec__stop(env, android_media_codec);
-    if (SDL_JNI_CatchException(env)) {
+    if (JJK_ExceptionCheck__catchAll(env)) {
         ALOGE("%s: stop", __func__);
         return SDL_AMEDIA_ERROR_UNKNOWN;
     }
@@ -195,7 +195,7 @@ static sdl_amedia_status_t SDL_AMediaCodecJava_flush(SDL_AMediaCodec* acodec)
 
     jobject android_media_codec = SDL_AMediaCodecJava_getObject(env, acodec);
     JJKC_MediaCodec__flush(env, android_media_codec);
-    if (SDL_JNI_CatchException(env)) {
+    if (JJK_ExceptionCheck__catchAll(env)) {
         ALOGE("%s: flush", __func__);
         return SDL_AMEDIA_ERROR_UNKNOWN;
     }
@@ -220,20 +220,20 @@ static uint8_t* SDL_AMediaCodecJava_getInputBuffer(SDL_AMediaCodec* acodec, size
 
     assert(opaque->input_buffer_array);
     int buffer_count = (*env)->GetArrayLength(env, opaque->input_buffer_array);
-    if (SDL_JNI_CatchException(env) || idx < 0 || idx >= buffer_count) {
+    if (JJK_ExceptionCheck__catchAll(env) || idx < 0 || idx >= buffer_count) {
         ALOGE("%s: idx(%d) < count(%d)\n", __func__, (int)idx, (int)buffer_count);
         return NULL;
     }
 
     SDL_JNI_DeleteGlobalRefP(env, &opaque->input_buffer);
     jobject local_input_buffer = (*env)->GetObjectArrayElement(env, opaque->input_buffer_array, idx);
-    if (SDL_JNI_CatchException(env) || !local_input_buffer) {
+    if (JJK_ExceptionCheck__catchAll(env) || !local_input_buffer) {
         ALOGE("%s: GetObjectArrayElement failed\n", __func__);
         return NULL;
     }
     opaque->input_buffer = (*env)->NewGlobalRef(env, local_input_buffer);
     SDL_JNI_DeleteLocalRefP(env, &local_input_buffer);
-    if (SDL_JNI_CatchException(env) || !opaque->input_buffer) {
+    if (JJK_ExceptionCheck__catchAll(env) || !opaque->input_buffer) {
         ALOGE("%s: GetObjectArrayElement.NewGlobalRef failed\n", __func__);
         return NULL;
     }
@@ -267,7 +267,7 @@ ssize_t SDL_AMediaCodecJava_dequeueInputBuffer(SDL_AMediaCodec* acodec, int64_t
 
     jobject android_media_codec = opaque->android_media_codec;
     jint idx = JJKC_MediaCodec__dequeueInputBuffer(env, android_media_codec, (jlong)timeoutUs);
-    if (SDL_JNI_CatchException(env)) {
+    if (JJK_ExceptionCheck__catchAll(env)) {
         ALOGE("%s: dequeueInputBuffer failed", __func__);
         opaque->is_input_buffer_valid = false;
         return -1;
@@ -289,7 +289,7 @@ sdl_amedia_status_t SDL_AMediaCodecJava_queueInputBuffer(SDL_AMediaCodec* acodec
     SDL_AMediaCodec_Opaque *opaque = (SDL_AMediaCodec_Opaque *)acodec->opaque;
     jobject android_media_codec = opaque->android_media_codec;
     JJKC_MediaCodec__queueInputBuffer(env, android_media_codec, (jint)idx, (jint)offset, (jint)size, (jlong)time, (jint)flags);
-    if (SDL_JNI_CatchException(env)) {
+    if (JJK_ExceptionCheck__catchAll(env)) {
         return SDL_AMEDIA_ERROR_UNKNOWN;
     }
 
@@ -317,7 +317,7 @@ ssize_t SDL_AMediaCodecJava_dequeueOutputBuffer(SDL_AMediaCodec* acodec, SDL_AMe
     jint idx = AMEDIACODEC__UNKNOWN_ERROR;
     while (1) {
         idx = JJKC_MediaCodec__dequeueOutputBuffer(env, android_media_codec, opaque->output_buffer_info, (jlong)timeoutUs);
-        if (SDL_JNI_CatchException(env)) {
+        if (JJK_ExceptionCheck__catchAll(env)) {
             ALOGI("%s: Exception\n", __func__);
             return AMEDIACODEC__UNKNOWN_ERROR;
         }
@@ -355,7 +355,7 @@ sdl_amedia_status_t SDL_AMediaCodecJava_releaseOutputBuffer(SDL_AMediaCodec* aco
     SDL_AMediaCodec_Opaque *opaque = (SDL_AMediaCodec_Opaque *)acodec->opaque;
     jobject android_media_codec = opaque->android_media_codec;
     JJKC_MediaCodec__releaseOutputBuffer(env, android_media_codec, (jint)idx, (jboolean)render);
-    if (SDL_JNI_CatchException(env)) {
+    if (JJK_ExceptionCheck__catchAll(env)) {
         ALOGE("%s: releaseOutputBuffer\n", __func__);
         return SDL_AMEDIA_ERROR_UNKNOWN;
     }
@@ -374,7 +374,7 @@ static SDL_AMediaCodec* SDL_AMediaCodecJava_init(JNIEnv *env, jobject android_me
     SDLTRACE("%s", __func__);
 
     jobject global_android_media_codec = (*env)->NewGlobalRef(env, android_media_codec);
-    if (SDL_JNI_CatchException(env) || !global_android_media_codec) {
+    if (JJK_ExceptionCheck__catchAll(env) || !global_android_media_codec) {
         return NULL;
     }
 
@@ -416,7 +416,7 @@ SDL_AMediaCodec* SDL_AMediaCodecJava_createByCodecName(JNIEnv *env, const char *
     SDLTRACE("%s", __func__);
 
     jobject android_media_codec = JJKC_MediaCodec__createByCodecName__withCString(env, codec_name);
-    if (SDL_JNI_CatchException(env) || !android_media_codec) {
+    if (JJK_ExceptionCheck__catchAll(env) || !android_media_codec) {
         return NULL;
     }
 

ijkmedia/ijksdl/android/ijksdl_codec_android_mediaformat_java.c

@@ -91,7 +91,7 @@ static bool SDL_AMediaFormatJava_getInt32(SDL_AMediaFormat* aformat, const char*
     }
 
     jint ret = JJKC_MediaFormat__getInteger__withCString(env, android_media_format, name);
-    if (SDL_JNI_CatchException(env)) {
+    if (JJK_ExceptionCheck__catchAll(env)) {
         ALOGE("%s: CallIntMethod: failed", __func__);
         return false;
     }
@@ -116,7 +116,7 @@ static void SDL_AMediaFormatJava_setInt32(SDL_AMediaFormat* aformat, const char*
     }
 
     JJKC_MediaFormat__setInteger__withCString(env, android_media_format, name, value);
-    if (SDL_JNI_CatchException(env)) {
+    if (JJK_ExceptionCheck__catchAll(env)) {
         ALOGE("%s: CallVoidMethod: failed", __func__);
         return;
     }
@@ -148,7 +148,7 @@ static void SDL_AMediaFormatJava_setBuffer(SDL_AMediaFormat* aformat, const char
     }
 
     JJKC_MediaFormat__setByteBuffer__withCString(env, android_media_format, name, opaque->android_byte_buffer);
-    if (SDL_JNI_CatchException(env)) {
+    if (JJK_ExceptionCheck__catchAll(env)) {
         ALOGE("%s: call jmid_setByteBuffer: failed", __func__);
         return;
     }
@@ -168,7 +168,7 @@ SDL_AMediaFormat *SDL_AMediaFormatJava_init(JNIEnv *env, jobject android_format)
 {
     SDLTRACE("%s", __func__);
     jobject global_android_media_format = (*env)->NewGlobalRef(env, android_format);
-    if (SDL_JNI_CatchException(env) || !global_android_media_format) {
+    if (JJK_ExceptionCheck__catchAll(env) || !global_android_media_format) {
         return NULL;
     }
 
@@ -187,7 +187,7 @@ SDL_AMediaFormat *SDL_AMediaFormatJava_createVideoFormat(JNIEnv *env, const char
     SDLTRACE("%s", __func__);
 
     jobject android_media_format = JJKC_MediaFormat__createVideoFormat__withCString__asGlobalRef__catchAll(env, mime, width, height);
-    if (SDL_JNI_CatchException(env) || !android_media_format) {
+    if (JJK_ExceptionCheck__catchAll(env) || !android_media_format) {
         return NULL;
     }