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

Commit 7b7726b7 authored by Narayan Kamath's avatar Narayan Kamath Committed by Gerrit Code Review
Browse files

Merge "Fix in MediaMuxer's JNI code"

parents b823bd45 d2507a2f

media/jni/android_media_MediaMuxer.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -132,7 +132,7 @@ static void android_media_MediaMuxer_writeSampleData( 
}

}





// Constructor counterpart.

// Constructor counterpart.

static jint android_media_MediaMuxer_native_setup(

static jlong android_media_MediaMuxer_native_setup(

        JNIEnv *env, jclass clazz, jobject fileDescriptor,

        JNIEnv *env, jclass clazz, jobject fileDescriptor,

        jint format) {

        jint format) {

    int fd = jniGetFDFromFileDescriptor(env, fileDescriptor);

    int fd = jniGetFDFromFileDescriptor(env, fileDescriptor);
@@ -142,7 +142,7 @@ static jint android_media_MediaMuxer_native_setup( 
        static_cast<MediaMuxer::OutputFormat>(format);

        static_cast<MediaMuxer::OutputFormat>(format);

    sp<MediaMuxer> muxer = new MediaMuxer(fd, fileFormat);

    sp<MediaMuxer> muxer = new MediaMuxer(fd, fileFormat);

    muxer->incStrong(clazz);

    muxer->incStrong(clazz);

    return int(muxer.get());

    return reinterpret_cast<jlong>(muxer.get());

}

}





static void android_media_MediaMuxer_setOrientationHint(

static void android_media_MediaMuxer_setOrientationHint(