Added option to disable normalization when exporting with AudioMixer

Author: RaphiMC

src/main/java/net/raphimc/noteblocktool/audio/export/impl/AudioMixerAudioExporter.java

@@ -20,6 +20,7 @@
 import net.raphimc.audiomixer.AudioMixer;
 import net.raphimc.audiomixer.pcmsource.impl.MonoIntPcmSource;
 import net.raphimc.audiomixer.sound.impl.pcm.OptimizedMonoSound;
+import net.raphimc.audiomixer.soundmodifier.impl.NormalizationModifier;
 import net.raphimc.audiomixer.util.AudioFormats;
 import net.raphimc.audiomixer.util.SoundSampleUtil;
 import net.raphimc.audiomixer.util.io.SoundIO;
@@ -36,18 +37,24 @@
 
 public class AudioMixerAudioExporter extends AudioExporter {
 
+    private final boolean globalNormalization;
     protected final Map<String, int[]> sounds;
     protected final AudioMixer audioMixer;
 
-    public AudioMixerAudioExporter(final SongView<?> songView, final AudioFormat format, final float masterVolume, final Consumer<Float> progressConsumer) {
+    public AudioMixerAudioExporter(final SongView<?> songView, final AudioFormat format, final float masterVolume, final boolean globalNormalization, final Consumer<Float> progressConsumer) {
         super(songView, format, masterVolume, progressConsumer);
+        this.globalNormalization = globalNormalization;
+
         try {
             this.sounds = new HashMap<>();
             for (Map.Entry<String, byte[]> entry : SoundMap.loadSoundData(songView).entrySet()) {
                 this.sounds.put(entry.getKey(), SoundIO.readSamples(SoundFileUtil.readAudioFile(new ByteArrayInputStream(entry.getValue())), AudioFormats.withChannels(format, 1)));
             }
             this.audioMixer = new AudioMixer(format);
             this.audioMixer.getMasterMixSound().setMaxSounds(8192);
+            if (!this.globalNormalization) {
+                this.audioMixer.getMasterMixSound().getSoundModifiers().append(new NormalizationModifier());
+            }
         } catch (Throwable e) {
             throw new RuntimeException("Failed to initialize AudioMixer audio exporter", e);
         }
@@ -67,7 +74,9 @@ protected void postTick() {
 
     @Override
     protected void finish() {
-        SoundSampleUtil.normalize(this.samples.getArrayDirect(), (int) Math.pow(2, this.format.getSampleSizeInBits() - 1) - 1);
+        if (this.globalNormalization) {
+            SoundSampleUtil.normalize(this.samples.getArrayDirect(), (int) Math.pow(2, this.format.getSampleSizeInBits() - 1) - 1);
+        }
     }
 
 }

src/main/java/net/raphimc/noteblocktool/frames/ExportFrame.java

@@ -68,7 +68,7 @@ public class ExportFrame extends JFrame {
     private final List<ListFrame.LoadedSong> loadedSongs;
     private final JComboBox<String> format = new JComboBox<>(new String[]{"NBS", "MP3 (Using LAME encoder)", "WAV", "AIF"});
     private final JLabel soundSystemLabel = new JLabel("Sound System:");
-    private final JComboBox<String> soundSystem = new JComboBox<>(new String[]{"OpenAL (best sound quality, fastest)", "AudioMixer (normalized)", "Un4seen BASS"});
+    private final JComboBox<String> soundSystem = new JComboBox<>(new String[]{"OpenAL (best sound quality, fastest)", "AudioMixer", "AudioMixer (global normalized)", "Un4seen BASS"});
     private final JLabel sampleRateLabel = new JLabel("Sample Rate:");
     private final JSpinner sampleRate = new JSpinner(new SpinnerNumberModel(48000, 8000, 192000, 8000));
     private final JLabel bitDepthLabel = new JLabel("PCM Bit Depth:");
@@ -267,7 +267,7 @@ private File openFileChooser() {
     private void doExport(final File outFile) {
         final boolean isAudioFile = this.format.getSelectedIndex() != 0;
         final boolean isMp3 = this.format.getSelectedIndex() == 1;
-        final boolean bassSoundSystem = this.soundSystem.getSelectedIndex() == 2;
+        final boolean bassSoundSystem = this.soundSystem.getSelectedIndex() == 3;
         final AudioFormat format = new AudioFormat(
                 ((Number) this.sampleRate.getValue()).floatValue(),
                 !isMp3 ? Integer.parseInt(this.bitDepth.getSelectedItem().toString().substring(4)) : 16,
@@ -413,8 +413,10 @@ private void exportSong(final ListFrame.LoadedSong song, final AudioFormat forma
             if (this.soundSystem.getSelectedIndex() == 0) {
                 exporter = new OpenALAudioExporter(songView, format, this.volume.getValue() / 100F, progressConsumer);
             } else if (this.soundSystem.getSelectedIndex() == 1) {
-                exporter = new AudioMixerAudioExporter(songView, format, this.volume.getValue() / 100F, progressConsumer);
+                exporter = new AudioMixerAudioExporter(songView, format, this.volume.getValue() / 100F, false, progressConsumer);
             } else if (this.soundSystem.getSelectedIndex() == 2) {
+                exporter = new AudioMixerAudioExporter(songView, format, this.volume.getValue() / 100F, true, progressConsumer);
+            } else if (this.soundSystem.getSelectedIndex() == 3) {
                 exporter = new BassAudioExporter(songView, format, this.volume.getValue() / 100F, progressConsumer);
             } else {
                 throw new UnsupportedOperationException("Unsupported sound system: " + this.soundSystem.getSelectedIndex());