don't leak state in JNI

Author: crc-32

library/src/androidMain/kotlin/coredevices/speex/SpeexCodec.android.kt

@@ -7,16 +7,6 @@ actual class SpeexCodec actual constructor(
     private val bitRate: Int,
     private val frameSize: Int
 ): AutoCloseable {
-    private val gain = 1.0f
-    enum class Preprocessor(val flagValue: Int) {
-        DENOISE(1),
-        AGC(2),
-        VAD(4)
-    }
-
-    init {
-        initNative()
-    }
     private val speexDecBits: Long = initSpeexBits()
     private val speexDecState: Long = initDecState(sampleRate, bitRate)
 
@@ -28,7 +18,7 @@ actual class SpeexCodec actual constructor(
      */
     actual fun decodeFrame(encodedFrame: ByteArray, decodedFrame: ByteArray, hasHeaderByte: Boolean): SpeexDecodeResult {
         val decodedFrameBuf = ByteBuffer.allocateDirect(decodedFrame.size)
-        val result = SpeexDecodeResult.fromInt(decode(encodedFrame, decodedFrameBuf, hasHeaderByte))
+        val result = SpeexDecodeResult.fromInt(decode(encodedFrame, decodedFrameBuf, this.speexDecBits, this.speexDecState, hasHeaderByte))
         if (result == SpeexDecodeResult.Success) {
             decodedFrameBuf.get(decodedFrame, 0, decodedFrame.size)
         }
@@ -39,9 +29,7 @@ actual class SpeexCodec actual constructor(
         destroySpeexBits(speexDecBits)
         destroyDecState(speexDecState)
     }
-
-    private external fun initNative()
-    private external fun decode(encodedFrame: ByteArray, decodedFrame: ByteBuffer, hasHeaderByte: Boolean): Int
+    private external fun decode(encodedFrame: ByteArray, decodedFrame: ByteBuffer, speexDecBits: Long, speexDecState: Long, hasHeaderByte: Boolean): Int
     private external fun initSpeexBits(): Long
     private external fun initDecState(sampleRate: Long, bitRate: Int): Long
     private external fun destroySpeexBits(speexBits: Long)

speex/speex_codec_jni.cpp

@@ -3,20 +3,18 @@
 #include <speex/speex.h>
 //#include <speex/speex_preprocess.h>
 
-static jfieldID speexDecBits;
-static jfieldID speexDecState;
-
 extern "C"
 JNIEXPORT jint
 
 JNICALL
 Java_coredevices_speex_SpeexCodec_decode(JNIEnv *env, jobject thiz,
-        jbyteArray encoded_frame, jobject out_frame, jboolean has_header_byte) {
+        jbyteArray encoded_frame, jobject out_frame, jlong speexDecBits, jlong speexDecState, jboolean has_header_byte) {
     jbyte *encoded_frame_data = env->GetByteArrayElements(encoded_frame, nullptr);
     jsize encoded_frame_length = env->GetArrayLength(encoded_frame);
     auto *out_frame_data = reinterpret_cast<spx_int16_t *>(env->GetDirectBufferAddress(out_frame));
-    auto *bits = reinterpret_cast<SpeexBits *>(env->GetLongField(thiz, speexDecBits));
-    auto *dec_state = reinterpret_cast<void *>(env->GetLongField(thiz, speexDecState));
+    auto clazz = env->GetObjectClass(thiz);
+    auto *bits = reinterpret_cast<SpeexBits *>(speexDecBits);
+    auto *dec_state = reinterpret_cast<void *>(speexDecState);
     int offset = has_header_byte ? 1 : 0;
     speex_bits_read_from(bits, reinterpret_cast<char *>(encoded_frame_data) + offset, encoded_frame_length - offset);
     int result = speex_decode_int(dec_state, bits, out_frame_data);
@@ -64,14 +62,4 @@ Java_coredevices_speex_SpeexCodec_destroyDecState(
 ) {
     auto *state = reinterpret_cast<void *>(dec_state);
     speex_decoder_destroy(state);
-}
-extern "C"
-JNIEXPORT void JNICALL
-Java_coredevices_speex_SpeexCodec_initNative(
-    JNIEnv *env,
-    jobject thiz
-) {
-    jclass clazz = env->GetObjectClass(thiz);
-    speexDecBits = env->GetFieldID(clazz, "speexDecBits", "J");
-    speexDecState = env->GetFieldID(clazz, "speexDecState", "J");
 }