Fixed audio generation on Android

lemcoder · lemcoder · commit 526bb7f60e68 · 2024-12-08T22:22:46.000+01:00
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-lib = "0.1.7"
+lib = "0.1.8"
 
 agp = "8.7.3"
 kotlin = "2.1.0"
diff --git a/midi/build.gradle.kts b/midi/build.gradle.kts
@@ -52,7 +52,7 @@ kotlin {
     sourceSets {
 
         commonMain.dependencies {
-//            implementation(projects.soundfont)
+            implementation(projects.soundfont)
             implementation(libs.kotlinx.io)
         }
 
@@ -115,15 +115,15 @@ mavenPublishing {
 
 // Sign with default plugin
 signing {
-    useInMemoryPgpKeys(
-        System.getenv("SIGNING_KEY"),
-        System.getenv("SIGNING_KEY_PASSWORD")
-    )
-    sign(publishing.publications)
-
-    // Temporary workaround, see https://github.com/gradle/gradle/issues/26091#issuecomment-1722947958
-    tasks.withType<AbstractPublishToMaven>().configureEach {
-        val signingTasks = tasks.withType<Sign>()
-        mustRunAfter(signingTasks)
-    }
+//    useInMemoryPgpKeys(
+//        System.getenv("SIGNING_KEY"),
+//        System.getenv("SIGNING_KEY_PASSWORD")
+//    )
+//    sign(publishing.publications)
+//
+//    // Temporary workaround, see https://github.com/gradle/gradle/issues/26091#issuecomment-1722947958
+//    tasks.withType<AbstractPublishToMaven>().configureEach {
+//        val signingTasks = tasks.withType<Sign>()
+//        mustRunAfter(signingTasks)
+//    }
 }
diff --git a/midi/src/commonMain/kotlin/io/github/lemcoder/mikrosoundfont/midi/MidiSequencer.kt b/midi/src/commonMain/kotlin/io/github/lemcoder/mikrosoundfont/midi/MidiSequencer.kt
@@ -5,6 +5,7 @@ import io.github.lemcoder.mikrosoundfont.SoundFont
 class MidiSequencer(
     private val soundFont: SoundFont,
     private val sampleRate: Int,
+    private val channels: Int
 ) {
     private val sampleBlockSize: Int = 512
     private val messages = mutableListOf<MidiMessage>()
@@ -24,16 +25,16 @@ class MidiSequencer(
 
             while (targetTime > currentTime) {
                 currentTime += (sampleBlockSize * (1000.0 / sampleRate)).toInt()
-                audioBuffer += soundFont.renderFloat(sampleBlockSize, false)
+                audioBuffer += soundFont.renderFloat(sampleBlockSize, channels, false)
             }
         }
 
         return audioBuffer
     }
 
     private fun MidiMessage.process() = when (this) {
-        is MidiVoiceMessage.NoteOff       -> soundFont.channels[channel].noteOff(key)
-        is MidiVoiceMessage.NoteOn        -> soundFont.channels[channel].noteOn(key, if (velocity == 0) 0f else 1f)
+        is MidiVoiceMessage.NoteOff       -> soundFont.noteOff(channel, key)
+        is MidiVoiceMessage.NoteOn        -> soundFont.noteOn(channel, key, velocity / 127.0f)
         is MidiVoiceMessage.PitchBend     -> soundFont.channels[channel].setPitchWheel(pitchBend)
         is MidiVoiceMessage.ProgramChange -> soundFont.channels[channel].setPresetNumber(program, channel == 9)
         is MidiVoiceMessage.ControlChange -> soundFont.channels[channel].setMidiControl(control, controlValue)
diff --git a/soundfont/build.gradle.kts b/soundfont/build.gradle.kts
@@ -141,15 +141,15 @@ mavenPublishing {
 
 // Sign with default plugin
 signing {
-    useInMemoryPgpKeys(
-        System.getenv("SIGNING_KEY"),
-        System.getenv("SIGNING_KEY_PASSWORD")
-    )
-    sign(publishing.publications)
-
-    // Temporary workaround, see https://github.com/gradle/gradle/issues/26091#issuecomment-1722947958
-    tasks.withType<AbstractPublishToMaven>().configureEach {
-        val signingTasks = tasks.withType<Sign>()
-        mustRunAfter(signingTasks)
-    }
+//    useInMemoryPgpKeys(
+//        System.getenv("SIGNING_KEY"),
+//        System.getenv("SIGNING_KEY_PASSWORD")
+//    )
+//    sign(publishing.publications)
+//
+//    // Temporary workaround, see https://github.com/gradle/gradle/issues/26091#issuecomment-1722947958
+//    tasks.withType<AbstractPublishToMaven>().configureEach {
+//        val signingTasks = tasks.withType<Sign>()
+//        mustRunAfter(signingTasks)
+//    }
 }
diff --git a/soundfont/src/androidMain/cpp/mikro_sound_font_jni.c b/soundfont/src/androidMain/cpp/mikro_sound_font_jni.c
@@ -88,10 +88,10 @@ JNIEXPORT void JNICALL Java_io_github_lemcoder_mikrosoundfont_internal_SoundFont
     }
 }
 
-JNIEXPORT jfloatArray JNICALL Java_io_github_lemcoder_mikrosoundfont_internal_SoundFontDelegate_renderFloat(JNIEnv *env, jobject obj, jint samples, jboolean isMixing) {
+JNIEXPORT jfloatArray JNICALL Java_io_github_lemcoder_mikrosoundfont_internal_SoundFontDelegate_renderFloat(JNIEnv *env, jobject obj, jint samples, jint channels, jboolean isMixing) {
     if (g_tsf) {
-        int item_count = samples * 2;
-        float *buffer = malloc(item_count * sizeof(float) * 2);
+        int item_count = samples * channels;
+        float *buffer = malloc(item_count * sizeof(float) * channels);
         tsf_render_float(g_tsf, buffer, samples, 0);
 
         jfloatArray output = (*env)->NewFloatArray(env, item_count);
@@ -100,6 +100,7 @@ JNIEXPORT jfloatArray JNICALL Java_io_github_lemcoder_mikrosoundfont_internal_So
 
         return output;
     }
+
     return NULL;
 }
 
diff --git a/soundfont/src/androidMain/kotlin/io/github/lemcoder/mikrosoundfont/internal/SoundFontDelegate.android.kt b/soundfont/src/androidMain/kotlin/io/github/lemcoder/mikrosoundfont/internal/SoundFontDelegate.android.kt
@@ -47,5 +47,5 @@ internal class SoundFontDelegate : SoundFont {
     external override fun noteOffAll()
     external override fun activeVoiceCount(): Int
     external override fun setBankPreset(channel: Int, bank: Int, presetNumber: Int)
-    external override fun renderFloat(samples: Int, isMixing: Boolean): FloatArray
+    external override fun renderFloat(samples: Int, channels: Int, isMixing: Boolean): FloatArray
 }
diff --git a/soundfont/src/commonMain/kotlin/io/github/lemcoder/mikrosoundfont/SoundFont.kt b/soundfont/src/commonMain/kotlin/io/github/lemcoder/mikrosoundfont/SoundFont.kt
@@ -106,7 +106,7 @@ interface SoundFont {
      * Render output samples in F32 format
      * @param isMixing: if false clear the buffer first, otherwise mix into existing data
      */
-    fun renderFloat(samples: Int, isMixing: Boolean): FloatArray
+    fun renderFloat(samples: Int, channels: Int, isMixing: Boolean): FloatArray
 
     /**
      * Supported output modes by the render methods
diff --git a/soundfont/src/nativeMain/kotlin/io/github/lemcoder/mikrosoundfont/internal/SoundFontDelegate.native.kt b/soundfont/src/nativeMain/kotlin/io/github/lemcoder/mikrosoundfont/internal/SoundFontDelegate.native.kt
@@ -90,7 +90,6 @@ internal class SoundFontDelegate : SoundFont {
                 SoundFont.OutputMode.TSF_STEREO_UNWEAVED    -> TSFOutputMode.TSF_STEREO_UNWEAVED
                 SoundFont.OutputMode.TSF_MONO               -> TSFOutputMode.TSF_MONO
             }
-            tsf_set_output(it.reinterpret(), tsfMode, sampleRate, globalGainDb)
         }
     }
 
@@ -148,9 +147,9 @@ internal class SoundFontDelegate : SoundFont {
         }
     }
 
-    override fun renderFloat(samples: Int, isMixing: Boolean): FloatArray {
+    override fun renderFloat(samples: Int, channels: Int, isMixing: Boolean): FloatArray {
         return withSoundFont {
-            val buffer = FloatArray(samples * 2)
+            val buffer = FloatArray(samples * channels)
             val flagMixing = if (isMixing) 1 else 0
             tsf_render_float(it.reinterpret(), buffer.refTo(0), samples, flagMixing)
             buffer

Original file line number	Diff line number	Diff line change
`@@ -88,10 +88,10 @@ JNIEXPORT void JNICALL Java_io_github_lemcoder_mikrosoundfont_internal_SoundFont`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
`91`		`-JNIEXPORT jfloatArray JNICALL Java_io_github_lemcoder_mikrosoundfont_internal_SoundFontDelegate_renderFloat(JNIEnv *env, jobject obj, jint samples, jboolean isMixing) {`
	`91`	`+JNIEXPORT jfloatArray JNICALL Java_io_github_lemcoder_mikrosoundfont_internal_SoundFontDelegate_renderFloat(JNIEnv *env, jobject obj, jint samples, jint channels, jboolean isMixing) {`
`92`	`92`	`if (g_tsf) {`
`93`		`- int item_count = samples * 2;`
`94`		`- float buffer = malloc(item_count sizeof(float) * 2);`
	`93`	`+ int item_count = samples * channels;`
	`94`	`+ float buffer = malloc(item_count sizeof(float) * channels);`
`95`	`95`	`tsf_render_float(g_tsf, buffer, samples, 0);`
`96`	`96`
`97`	`97`	`jfloatArray output = (*env)->NewFloatArray(env, item_count);`
`@@ -100,6 +100,7 @@ JNIEXPORT jfloatArray JNICALL Java_io_github_lemcoder_mikrosoundfont_internal_So`
`100`	`100`
`101`	`101`	`return output;`
`102`	`102`	`}`
	`103`	`+`
`103`	`104`	`return NULL;`
`104`	`105`	`}`
`105`	`106`
Original file line number	Diff line number	Diff line change
`@@ -47,5 +47,5 @@ internal class SoundFontDelegate : SoundFont {`
`47`	`47`	`external override fun noteOffAll()`
`48`	`48`	`external override fun activeVoiceCount(): Int`
`49`	`49`	`external override fun setBankPreset(channel: Int, bank: Int, presetNumber: Int)`
`50`		`- external override fun renderFloat(samples: Int, isMixing: Boolean): FloatArray`
	`50`	`+ external override fun renderFloat(samples: Int, channels: Int, isMixing: Boolean): FloatArray`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,6 @@ internal class SoundFontDelegate : SoundFont {`
`90`	`90`	`SoundFont.OutputMode.TSF_STEREO_UNWEAVED -> TSFOutputMode.TSF_STEREO_UNWEAVED`
`91`	`91`	`SoundFont.OutputMode.TSF_MONO -> TSFOutputMode.TSF_MONO`
`92`	`92`	`}`
`93`		`- tsf_set_output(it.reinterpret(), tsfMode, sampleRate, globalGainDb)`
`94`	`93`	`}`
`95`	`94`	`}`
`96`	`95`
`@@ -148,9 +147,9 @@ internal class SoundFontDelegate : SoundFont {`
`148`	`147`	`}`
`149`	`148`	`}`
`150`	`149`
`151`		`- override fun renderFloat(samples: Int, isMixing: Boolean): FloatArray {`
	`150`	`+ override fun renderFloat(samples: Int, channels: Int, isMixing: Boolean): FloatArray {`
`152`	`151`	`return withSoundFont {`
`153`		`- val buffer = FloatArray(samples * 2)`
	`152`	`+ val buffer = FloatArray(samples * channels)`
`154`	`153`	`val flagMixing = if (isMixing) 1 else 0`
`155`	`154`	`tsf_render_float(it.reinterpret(), buffer.refTo(0), samples, flagMixing)`
`156`	`155`	`buffer`