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

Commit 213f243f authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 87a82800: am aef12450: am 1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant" 

* commit '87a82800':
  Make YuvToJpegEncoder more JNI compliant
parents 775667c0 87a82800

core/jni/android/graphics/YuvToJpegEncoder.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -217,8 +217,8 @@ void Yuv422IToJpegEncoder::configSamplingFactors(jpeg_compress_struct* cinfo) { 
///////////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////////





static jboolean YuvImage_compressToJpeg(JNIEnv* env, jobject, jbyteArray inYuv,

static jboolean YuvImage_compressToJpeg(JNIEnv* env, jobject, jbyteArray inYuv,

        int format, int width, int height, jintArray offsets,

        jint format, jint width, jint height, jintArray offsets,

        jintArray strides, int jpegQuality, jobject jstream,

        jintArray strides, jint jpegQuality, jobject jstream,

        jbyteArray jstorage) {

        jbyteArray jstorage) {

    jbyte* yuv = env->GetByteArrayElements(inYuv, NULL);

    jbyte* yuv = env->GetByteArrayElements(inYuv, NULL);

    SkWStream* strm = CreateJavaOutputStreamAdaptor(env, jstream, jstorage);

    SkWStream* strm = CreateJavaOutputStreamAdaptor(env, jstream, jstorage);
@@ -227,7 +227,7 @@ static jboolean YuvImage_compressToJpeg(JNIEnv* env, jobject, jbyteArray inYuv, 
    jint* imgStrides = env->GetIntArrayElements(strides, NULL);

    jint* imgStrides = env->GetIntArrayElements(strides, NULL);

    YuvToJpegEncoder* encoder = YuvToJpegEncoder::create(format, imgStrides);

    YuvToJpegEncoder* encoder = YuvToJpegEncoder::create(format, imgStrides);

    if (encoder == NULL) {

    if (encoder == NULL) {

        return false;

        return JNI_FALSE;

    }

    }

    encoder->encode(strm, yuv, width, height, imgOffsets, jpegQuality);

    encoder->encode(strm, yuv, width, height, imgOffsets, jpegQuality);
@@ -235,7 +235,7 @@ static jboolean YuvImage_compressToJpeg(JNIEnv* env, jobject, jbyteArray inYuv, 
    env->ReleaseByteArrayElements(inYuv, yuv, 0);

    env->ReleaseByteArrayElements(inYuv, yuv, 0);

    env->ReleaseIntArrayElements(offsets, imgOffsets, 0);

    env->ReleaseIntArrayElements(offsets, imgOffsets, 0);

    env->ReleaseIntArrayElements(strides, imgStrides, 0);

    env->ReleaseIntArrayElements(strides, imgStrides, 0);

    return true;

    return JNI_TRUE;

}

}

///////////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////////