Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15dd15fd authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Tidy up exception throwing in the media native code. 

(I'm going through all of frameworks/base in multiple passes. This pass is just
for exception throwing.)

Change-Id: Ia14a5c720edae86ac780023be88e676aa1b3315d
parent 6cab9a6e

media/jni/android_media_AmrInputStream.cpp

+3 −18
Original line number Diff line number Diff line
@@ -49,24 +49,11 @@ struct GsmAmrEncoderState { 
    int32_t mLastModeUsed;

};



//

// helper function to throw an exception

//

static void throwException(JNIEnv *env, const char* ex, const char* fmt, int data) {

    if (jclass cls = env->FindClass(ex)) {

        char msg[128];

        sprintf(msg, fmt, data);

        env->ThrowNew(cls, msg);

        env->DeleteLocalRef(cls);

    }

}



static jint android_media_AmrInputStream_GsmAmrEncoderNew

        (JNIEnv *env, jclass clazz) {

    GsmAmrEncoderState* gae = new GsmAmrEncoderState();

    if (gae == NULL) {

        throwException(env, "java/lang/RuntimeException",

                "Out of memory", 0);

        jniThrowRuntimeException(env, "Out of memory");

    }

    return (jint)gae;

}
@@ -76,7 +63,7 @@ static void android_media_AmrInputStream_GsmAmrEncoderInitialize 
    GsmAmrEncoderState *state = (GsmAmrEncoderState *) gae;

    int32_t nResult = AMREncodeInit(&state->mEncState, &state->mSidState, false);

    if (nResult != OK) {

        throwException(env, "java/lang/IllegalArgumentException",

        jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException",

                "GsmAmrEncoder initialization failed %d", nResult);

    }

}
@@ -97,7 +84,7 @@ static jint android_media_AmrInputStream_GsmAmrEncoderEncode 
                                (Frame_Type_3GPP*) &state->mLastModeUsed,

                                AMR_TX_WMF);

    if (length < 0) {

        throwException(env, "java/io/IOException",

        jniThrowExceptionFmt(env, "java/io/IOException",

                "Failed to encode a frame with error code: %d", length);

        return -1;

    }
@@ -148,5 +135,3 @@ int register_android_media_AmrInputStream(JNIEnv *env) 
    return AndroidRuntime::registerNativeMethods(env,

            kClassPathName, gMethods, NELEM(gMethods));

}

media/jni/android_media_MediaRecorder.cpp

+1 −3
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static void android_media_MediaRecorder_setCamera(JNIEnv* env, jobject thiz, job 
{

    // we should not pass a null camera to get_native_camera() call.

    if (camera == NULL) {

        jniThrowException(env, "java/lang/NullPointerException", "camera object is a NULL pointer");

        jniThrowNullPointerException(env, "camera object is a NULL pointer");

        return;

    }

    sp<Camera> c = get_native_camera(env, camera, NULL);
@@ -505,5 +505,3 @@ int register_android_media_MediaRecorder(JNIEnv *env) 
    return AndroidRuntime::registerNativeMethods(env,

                "android/media/MediaRecorder", gMethods, NELEM(gMethods));

}

media/jni/android_media_ResampleInputStream.cpp

+4 −19
Original line number Diff line number Diff line
@@ -36,19 +36,6 @@ 
using namespace android;





//

// helper function to throw an exception

//

static void throwException(JNIEnv *env, const char* ex, const char* fmt, int data) {

    if (jclass cls = env->FindClass(ex)) {

        char msg[1000];

        sprintf(msg, fmt, data);

        env->ThrowNew(cls, msg);

        env->DeleteLocalRef(cls);

    }

}





#define FIR_COEF(coef) (short)(0x10000 * coef)

static const short fir21[] = {

    FIR_COEF(-0.006965742326),
@@ -93,7 +80,7 @@ static void android_media_ResampleInputStream_fir21(JNIEnv *env, jclass clazz, 


    // safety first!

    if (nFir21 + jNpoints * 2 > BUF_SIZE) {

        throwException(env, "java/lang/IllegalArgumentException",

        jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException",

                "FIR+data too long %d", nFir21 + jNpoints);

        return;

    }
@@ -132,5 +119,3 @@ int register_android_media_ResampleInputStream(JNIEnv *env) 
    return AndroidRuntime::registerNativeMethods(env,

            kClassPathName, gMethods, NELEM(gMethods));

}

media/jni/android_mtp_MtpDatabase.cpp

+13 −18
Original line number Diff line number Diff line
@@ -182,28 +182,23 @@ MyMtpDatabase::MyMtpDatabase(JNIEnv *env, jobject client) 
        mLongBuffer(NULL),

        mStringBuffer(NULL)

{

    jintArray intArray;

    jlongArray longArray;

    jcharArray charArray;



    // create buffers for out arguments

    // we don't need to be thread-safe so this is OK

    intArray = env->NewIntArray(3);

    if (!intArray)

        goto out_of_memory;

    jintArray intArray = env->NewIntArray(3);

    if (!intArray) {

        return; // Already threw.

    }

    mIntBuffer = (jintArray)env->NewGlobalRef(intArray);

    longArray = env->NewLongArray(2);

    if (!longArray)

        goto out_of_memory;

    jlongArray longArray = env->NewLongArray(2);

    if (!longArray) {

        return; // Already threw.

    }

    mLongBuffer = (jlongArray)env->NewGlobalRef(longArray);

    charArray = env->NewCharArray(256);

    if (!charArray)

        goto out_of_memory;

    jcharArray charArray = env->NewCharArray(256);

    if (!charArray) {

        return; // Already threw.

    }

    mStringBuffer = (jcharArray)env->NewGlobalRef(charArray);

    return;



out_of_memory:

    env->ThrowNew(env->FindClass("java/lang/OutOfMemoryError"), NULL);

}



void MyMtpDatabase::cleanup(JNIEnv *env) {

media/libdrm/mobile1/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ LOCAL_C_INCLUDES := \ 
	



LOCAL_SHARED_LIBRARIES := libdrm1 \

    libnativehelper               \

    libutils                      \

    libcutils