diff --git a/src/main/java/io/github/dsheirer/alias/action/beep/BeepAction.java b/src/main/java/io/github/dsheirer/alias/action/beep/BeepAction.java
index d2e993ca..f6b6457b 100644
--- a/src/main/java/io/github/dsheirer/alias/action/beep/BeepAction.java
+++ b/src/main/java/io/github/dsheirer/alias/action/beep/BeepAction.java
@@ -1,7 +1,6 @@
/*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2018 Dennis Sheirer
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -15,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see 0)
{
- broadcastAudio(mSilenceGenerator.generate(mFinalSilencePadding));
+ List finalSilence = mSilenceGenerator.generate(mFinalSilencePadding);
+
+ for(byte[] silence: finalSilence)
+ {
+ broadcastAudio(silence);
+ }
+
mFinalSilencePadding = 0;
}
@@ -312,7 +319,11 @@ public abstract class AudioStreamingBroadcaster silenceFrames = mSilenceGenerator.generate(PROCESSOR_RUN_INTERVAL_MS);
+ for(byte[] silence: silenceFrames)
+ {
+ broadcastAudio(silence);
+ }
}
}
catch(Throwable t)
diff --git a/src/main/java/io/github/dsheirer/audio/broadcast/AudioStreamingManager.java b/src/main/java/io/github/dsheirer/audio/broadcast/AudioStreamingManager.java
index 352860ac..864d30e9 100644
--- a/src/main/java/io/github/dsheirer/audio/broadcast/AudioStreamingManager.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/AudioStreamingManager.java
@@ -1,6 +1,6 @@
/*
* *****************************************************************************
- * Copyright (C) 2014-2020 Dennis Sheirer
+ * Copyright (C) 2014-2022 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -150,7 +150,7 @@ public class AudioStreamingManager implements Listener
try
{
- AudioSegmentRecorder.record(audioSegment, path, RecordFormat.MP3);
+ AudioSegmentRecorder.record(audioSegment, path, RecordFormat.MP3, mUserPreferences);
IdentifierCollection identifierCollectionCopy =
new IdentifierCollection(audioSegment.getIdentifierCollection().getIdentifiers());
diff --git a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastFactory.java b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastFactory.java
index ad663354..f584d8d7 100644
--- a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastFactory.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastFactory.java
@@ -1,23 +1,20 @@
/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
*
- * * ******************************************************************************
- * * Copyright (C) 2014-2019 Dennis Sheirer
- * *
- * * This program is free software: you can redistribute it and/or modify
- * * it under the terms of the GNU General Public License as published by
- * * the Free Software Foundation, either version 3 of the License, or
- * * (at your option) any later version.
- * *
- * * This program is distributed in the hope that it will be useful,
- * * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * * GNU General Public License for more details.
- * *
- * * You should have received a copy of the GNU General Public License
- * * along with this program. If not, see mBroadcastEventBroadcaster = new Broadcaster<>();
private BroadcastEventListener mBroadcastEventListener = new BroadcastEventListener();
+ private UserPreferences mUserPreferences;
/**
* Model for managing Broadcast configurations and any associated broadcaster instances.
@@ -88,6 +86,7 @@ public class BroadcastModel extends AbstractTableModel implements Listener audioBuffers);
+ List convert(List audioBuffers);
/**
* Finalizes audio conversion by fully converting any partial frames left in the buffer and returning the
* remaining bytes to produce a full frame.
*/
- public byte[] flush();
+ List flush();
}
diff --git a/src/main/java/io/github/dsheirer/audio/convert/ISilenceGenerator.java b/src/main/java/io/github/dsheirer/audio/convert/ISilenceGenerator.java
index 42682944..eddfd389 100644
--- a/src/main/java/io/github/dsheirer/audio/convert/ISilenceGenerator.java
+++ b/src/main/java/io/github/dsheirer/audio/convert/ISilenceGenerator.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2016 Dennis Sheirer
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,11 +14,13 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see generate(long duration);
}
diff --git a/src/main/java/io/github/dsheirer/audio/convert/LameFactory.java b/src/main/java/io/github/dsheirer/audio/convert/LameFactory.java
new file mode 100644
index 00000000..4e418f5b
--- /dev/null
+++ b/src/main/java/io/github/dsheirer/audio/convert/LameFactory.java
@@ -0,0 +1,65 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see convert(List audioPackets)
+ {
+ List converted = new ArrayList<>();
+
+ if(mResampler != null)
+ {
+ audioPackets = mResampler.resample(audioPackets);
+ }
+
+ for(int x = 0; x < audioPackets.size(); x++)
+ {
+ byte[] bytesToEncode = ConversionUtils.convertToSigned16BitSamples(audioPackets.get(x)).array();
+ int bytesToEncodePointer = 0;
+
+ int inputChunkSize = FastMath.min(mOutputFramesBuffer.length, bytesToEncode.length);
+ int outputChunkSize = 0;
+
+ try
+ {
+ while(bytesToEncodePointer < bytesToEncode.length)
+ {
+ outputChunkSize = mEncoder.encodeBuffer(bytesToEncode, bytesToEncodePointer, inputChunkSize, mOutputFramesBuffer);
+ bytesToEncodePointer += inputChunkSize;
+ inputChunkSize = FastMath.min(mOutputFramesBuffer.length, bytesToEncode.length - bytesToEncodePointer);
+
+ if(outputChunkSize > 0)
+ {
+ converted.add(Arrays.copyOf(mOutputFramesBuffer, outputChunkSize));
+ }
+ }
+ }
+ catch(Exception e)
+ {
+ mLog.error("There was an error converting audio to MP3: " + e.getMessage());
+ }
+ }
+
+ int finalChunkSize = mEncoder.encodeFinish(mOutputFramesBuffer);
+
+ if(finalChunkSize > 0)
+ {
+ converted.add(Arrays.copyOf(mOutputFramesBuffer, finalChunkSize));
+ }
+
+ return converted;
}
@Override
- public byte[] convert(List audioPackets)
- {
- mMP3Stream.reset();
-
- byte[] pcmBytes = AudioUtils.convertTo16BitSamples(audioPackets);
-
- int pcmBufferSize = FastMath.min(mMP3Buffer.length, pcmBytes.length);
-
- int mp3BufferSize = 0;
-
- int pcmBytesPosition = 0;
-
- try
- {
- while (0 < (mp3BufferSize = mEncoder.encodeBuffer(pcmBytes, pcmBytesPosition, pcmBufferSize, mMP3Buffer)))
- {
- pcmBytesPosition += pcmBufferSize;
- pcmBufferSize = FastMath.min(mMP3Buffer.length, pcmBytes.length - pcmBytesPosition);
- mMP3Stream.write(mMP3Buffer, 0, mp3BufferSize);
- }
-
- return mMP3Stream.toByteArray();
- }
- catch(Exception e)
- {
- mLog.error("There was an error converting audio to MP3: " + e.getMessage());
- return new byte[0];
- }
- }
-
- public byte[] convertAudio(List audioBuffers)
- {
- mMP3Stream.reset();
-
- byte[] pcmBytes = AudioUtils.convert(audioBuffers);
-
- int pcmBufferSize = FastMath.min(mMP3Buffer.length, pcmBytes.length);
-
- int mp3BufferSize = 0;
-
- int pcmBytesPosition = 0;
-
- try
- {
- while (0 < (mp3BufferSize = mEncoder.encodeBuffer(pcmBytes, pcmBytesPosition, pcmBufferSize, mMP3Buffer)))
- {
- pcmBytesPosition += pcmBufferSize;
- pcmBufferSize = FastMath.min(mMP3Buffer.length, pcmBytes.length - pcmBytesPosition);
- mMP3Stream.write(mMP3Buffer, 0, mp3BufferSize);
- }
-
- return mMP3Stream.toByteArray();
- }
- catch(Exception e)
- {
- mLog.error("There was an error converting audio to MP3: " + e.getMessage());
- return new byte[0];
- }
- }
-
- @Override
- public byte[] flush()
+ public List flush()
{
byte[] lastPartialFrame = new byte[mEncoder.getMP3BufferSize()];
int length = mEncoder.encodeFinish(lastPartialFrame);
- return Arrays.copyOf(lastPartialFrame, length);
+ byte[] frame = Arrays.copyOf(lastPartialFrame, length);
+
+ if(frame.length == 0)
+ {
+ return Collections.emptyList();
+ }
+
+ return Collections.singletonList(frame);
}
}
diff --git a/src/main/java/io/github/dsheirer/audio/convert/MP3BitRate.java b/src/main/java/io/github/dsheirer/audio/convert/MP3BitRate.java
new file mode 100644
index 00000000..34ae29f8
--- /dev/null
+++ b/src/main/java/io/github/dsheirer/audio/convert/MP3BitRate.java
@@ -0,0 +1,55 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see frames)
{
- if(frames == null || frames.length == 0)
+ if(frames.isEmpty())
{
+ mLog.info("No Frame Data!");
return;
}
- if(frames.length % 144 != 0)
+ for(byte[] frame: frames)
{
- log("Frame byte array not multiple of 144 byte frame size - length:" + frames.length, frames);
- return;
- }
+ StringBuilder sb = new StringBuilder();
+ int frameCounter = 0;
- //Check for erroneous frame sync
- for(int x = 0; x < frames.length - 1; x++)
- {
- if(frames[x] == (byte)0xFF && (frames[x + 1] & 0xE0) == 0xE0 && (x % 144) != 0)
+ for(int x = 0; x < frame.length; x++)
{
- log("Bad frame sync detected at byte " + x + " in frame " + (x / 144), frames);
- return;
- }
- }
+ if(MP3Header.isValid(frame, x))
+ {
+ sb.append("\n").append(++frameCounter).append(": ");
+ sb.append(MP3Header.inspect(frame, x)).append(" - ");
+ }
- //Check MP3 headers
-
-// log("Frames ...", frames);
- }
-
- private static void log(String message, byte[] frames)
- {
- StringBuilder sb = new StringBuilder();
- sb.append(message).append("\n");
-
- int frameCounter = 0;
- sb.append(frameCounter++).append(" ");
-
- for(int x = 0; x < frames.length; x++)
- {
- if(x > 0 && x % 144 == 0)
- {
- sb.append("\n");
- sb.append(frameCounter++).append(" ");
+ sb.append(String.format("%02X ", frame[x]));
}
- sb.append(String.format("%02X ", frames[x]));
+ mLog.info(sb.toString());
}
-
- mLog.info(sb.toString());
}
public static void main(String[] args)
{
mLog.info("Starting ...");
- MP3SilenceGenerator gen = new MP3SilenceGenerator();
+ MP3SilenceGenerator gen = new MP3SilenceGenerator(AudioSampleRate.SR_8000, MP3Setting.getDefault());
- byte[] audio = gen.generate(173);
+ List audio = gen.generate(173);
inspect(audio);
diff --git a/src/main/java/io/github/dsheirer/audio/convert/MP3Header.java b/src/main/java/io/github/dsheirer/audio/convert/MP3Header.java
new file mode 100644
index 00000000..123d6ef8
--- /dev/null
+++ b/src/main/java/io/github/dsheirer/audio/convert/MP3Header.java
@@ -0,0 +1,115 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see generate(long duration_ms)
{
- int length = (int)(duration * 8); //8000 Hz sample rate
+ double duration_secs = (double)duration_ms / 1000.0;
+
+ //We generate silence at 8000 kHz, because it gets resampled by the silence generator to the target rate
+ int length = (int)(duration_secs * AudioSampleRate.SR_8000.getSampleRate());
List silenceBuffers = new ArrayList<>();
- silenceBuffers.add(new float[length]);
- byte[] frameData = mGenerator.convert(silenceBuffers);
- frameData = merge(mPreviousPartialFrameData, frameData);
-
- if(frameData != null && frameData.length > 0)
+ int added = 0;
+ while(added < length)
{
- if(frameData.length < 144)
- {
- mPreviousPartialFrameData = frameData;
- return null;
- }
- else if((frameData.length % 144) == 0)
- {
- mPreviousPartialFrameData = null;
- return frameData;
- }
- else
- {
- int integralFrameLength = (int)(frameData.length / 144) * 144;
- mPreviousPartialFrameData = Arrays.copyOfRange(frameData, integralFrameLength, frameData.length);
- return Arrays.copyOf(frameData, integralFrameLength);
- }
+ int chunk = Math.min(length - added, 256);
+ silenceBuffers.add(new float[chunk]);
+ added += chunk;
}
- return null;
+ return mMP3AudioConverter.convert(silenceBuffers);
}
private static byte[] merge(byte[] a, byte[] b)
@@ -100,19 +94,24 @@ public class MP3SilenceGenerator implements ISilenceGenerator
{
mLog.debug("Starting ...");
- for(long x = 243; x < 500; x ++)
+ MP3SilenceGenerator generator = new MP3SilenceGenerator(AudioSampleRate.SR_44100, MP3Setting.VBR_7);
+
+ int x = 100;
+
+// for(; x < 1000; x += 10)
+// {
+ List silenceFrames = generator.generate(x);
+
+ mLog.debug("Generated [" + silenceFrames.size() + "] silence frames");
+
+ for(byte[] silence: silenceFrames)
{
- MP3SilenceGenerator generator = new MP3SilenceGenerator();
-
- byte[] silence = generator.generate(x);
-
- if(silence != null && silence.length > 0)
- {
- mLog.debug("Silence:" + x + " Length:" + silence.length);
- MP3FrameInspector.inspect(silence);
- }
+ mLog.debug("Silence:" + x + " Length:" + silence.length);
}
+ MP3FrameInspector.inspect(silenceFrames);
+// }
+
mLog.debug("Finished");
}
}
diff --git a/src/main/java/io/github/dsheirer/audio/convert/MPEGLayer.java b/src/main/java/io/github/dsheirer/audio/convert/MPEGLayer.java
new file mode 100644
index 00000000..a8d8d7fe
--- /dev/null
+++ b/src/main/java/io/github/dsheirer/audio/convert/MPEGLayer.java
@@ -0,0 +1,62 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see resample(List audioPackets)
+ {
+ List resampled = new ArrayList<>();
+
+ mResampledListener = resampledAudio -> resampled.add(resampledAudio);
+
+ for(int x = 0; x < audioPackets.size(); x++)
+ {
+ if(x == audioPackets.size() - 1)
+ {
+ resample(audioPackets.get(x), true);
+ }
+ else
+ {
+ resample(audioPackets.get(x));
+ }
+ }
+
+ mResampledListener = null;
+ return resampled;
+ }
+
/**
* Primary input method to the resampler
* @param samples to resample
*/
public void resample(float[] samples)
+ {
+ resample(samples, false);
+ }
+
+ /**
+ * Primary input method to the resampler
+ * @param samples to resample
+ * @param lastBatch set to true if this is the last set of samples
+ */
+ public void resample(float[] samples, boolean lastBatch)
{
mBufferManager.load(samples);
- mResampler.process(mResampleFactor, mBufferManager, false);
+ mResampler.process(mResampleFactor, mBufferManager, lastBatch);
}
/**
diff --git a/src/main/java/io/github/dsheirer/gui/preference/PreferenceEditorFactory.java b/src/main/java/io/github/dsheirer/gui/preference/PreferenceEditorFactory.java
index 7baf12bc..5ec247de 100644
--- a/src/main/java/io/github/dsheirer/gui/preference/PreferenceEditorFactory.java
+++ b/src/main/java/io/github/dsheirer/gui/preference/PreferenceEditorFactory.java
@@ -23,6 +23,7 @@ import io.github.dsheirer.gui.preference.calibration.VectorCalibrationPreference
import io.github.dsheirer.gui.preference.decoder.JmbeLibraryPreferenceEditor;
import io.github.dsheirer.gui.preference.directory.DirectoryPreferenceEditor;
import io.github.dsheirer.gui.preference.duplicate.DuplicateCallPreferenceEditor;
+import io.github.dsheirer.gui.preference.mp3.MP3PreferenceEditor;
import io.github.dsheirer.gui.preference.playback.PlaybackPreferenceEditor;
import io.github.dsheirer.gui.preference.record.RecordPreferenceEditor;
import io.github.dsheirer.gui.preference.tuner.TunerPreferenceEditor;
@@ -40,6 +41,8 @@ public class PreferenceEditorFactory
{
case AUDIO_DUPLICATE_CALL_DETECTION:
return new DuplicateCallPreferenceEditor(userPreferences);
+ case AUDIO_MP3:
+ return new MP3PreferenceEditor(userPreferences);
case AUDIO_OUTPUT:
return new PlaybackPreferenceEditor(userPreferences);
case AUDIO_RECORD:
diff --git a/src/main/java/io/github/dsheirer/gui/preference/PreferenceEditorType.java b/src/main/java/io/github/dsheirer/gui/preference/PreferenceEditorType.java
index de98f775..7c8d8761 100644
--- a/src/main/java/io/github/dsheirer/gui/preference/PreferenceEditorType.java
+++ b/src/main/java/io/github/dsheirer/gui/preference/PreferenceEditorType.java
@@ -27,6 +27,7 @@ public enum PreferenceEditorType
CHANNEL_EVENT("Channel Events"),
DIRECTORY("Directories"),
JMBE_LIBRARY("JMBE Audio Library"),
+ AUDIO_MP3("MP3"),
AUDIO_RECORD("Record"),
AUDIO_OUTPUT("Output/Tones"),
AUDIO_DUPLICATE_CALL_DETECTION("Duplicate Calls"),
diff --git a/src/main/java/io/github/dsheirer/gui/preference/UserPreferencesEditor.java b/src/main/java/io/github/dsheirer/gui/preference/UserPreferencesEditor.java
index 78e12781..24062113 100644
--- a/src/main/java/io/github/dsheirer/gui/preference/UserPreferencesEditor.java
+++ b/src/main/java/io/github/dsheirer/gui/preference/UserPreferencesEditor.java
@@ -168,6 +168,7 @@ public class UserPreferencesEditor extends BorderPane
TreeItem audioItem = new TreeItem<>("Audio");
audioItem.getChildren().add(new TreeItem(PreferenceEditorType.AUDIO_DUPLICATE_CALL_DETECTION));
+ audioItem.getChildren().add(new TreeItem(PreferenceEditorType.AUDIO_MP3));
audioItem.getChildren().add(new TreeItem(PreferenceEditorType.AUDIO_OUTPUT));
audioItem.getChildren().add(new TreeItem(PreferenceEditorType.AUDIO_RECORD));
treeRoot.getChildren().add(audioItem);
diff --git a/src/main/java/io/github/dsheirer/gui/preference/mp3/MP3PreferenceEditor.java b/src/main/java/io/github/dsheirer/gui/preference/mp3/MP3PreferenceEditor.java
new file mode 100644
index 00000000..21d9aef8
--- /dev/null
+++ b/src/main/java/io/github/dsheirer/gui/preference/mp3/MP3PreferenceEditor.java
@@ -0,0 +1,112 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see mMP3SettingComboBox;
+ private ComboBox mAudioSampleRateComboBox;
+
+ public MP3PreferenceEditor(UserPreferences userPreferences)
+ {
+ mMP3Preference = userPreferences.getMP3Preference();
+ HBox.setHgrow(getEditorPane(), Priority.ALWAYS);
+ getChildren().add(getEditorPane());
+ }
+
+ private GridPane getEditorPane()
+ {
+ if(mEditorPane == null)
+ {
+ mEditorPane = new GridPane();
+ mEditorPane.setPadding(new Insets(10, 10, 10, 10));
+ mEditorPane.setHgap(10);
+ mEditorPane.setVgap(10);
+
+ int row = 0;
+ Label topLabel = new Label("MP3 Encoder Preferences");
+ mEditorPane.add(topLabel, 0, row++, 2, 1);
+
+ Label label = new Label("(LAME) Encoder Setting:");
+ GridPane.setHalignment(label, HPos.RIGHT);
+ mEditorPane.add(label, 0, row);
+ mEditorPane.add(getMP3SettingComboBox(), 1, row++);
+
+ Label sampleRateLabel = new Label("Input Audio Sample Rate:");
+ GridPane.setHalignment(sampleRateLabel, HPos.RIGHT);
+ mEditorPane.add(sampleRateLabel, 0, row);
+ mEditorPane.add(getAudioSampleRateComboBox(), 1, row++);
+
+ Label notice = new Label("Note: sdrtrunk default 8 kHz audio rate is resampled to input sample rate before MP3 encoding");
+ mEditorPane.add(notice, 0, row, 2, 1);
+ }
+
+ return mEditorPane;
+ }
+
+ private ComboBox getMP3SettingComboBox()
+ {
+ if(mMP3SettingComboBox == null)
+ {
+ mMP3SettingComboBox = new ComboBox<>();
+ mMP3SettingComboBox.getItems().addAll(MP3Setting.values());
+ mMP3SettingComboBox.getSelectionModel().select(mMP3Preference.getMP3Setting());
+ mMP3SettingComboBox.getSelectionModel().selectedItemProperty()
+ .addListener((observable, oldValue, newValue) -> mMP3Preference.setMP3Setting(newValue));
+ }
+
+ return mMP3SettingComboBox;
+ }
+
+ private ComboBox getAudioSampleRateComboBox()
+ {
+ if(mAudioSampleRateComboBox == null)
+ {
+ mAudioSampleRateComboBox = new ComboBox<>();
+ mAudioSampleRateComboBox.getItems().addAll(AudioSampleRate.values());
+ mAudioSampleRateComboBox.getSelectionModel().select(mMP3Preference.getAudioSampleRate());
+ mAudioSampleRateComboBox.getSelectionModel().selectedItemProperty()
+ .addListener((observable, oldValue, newValue) -> mMP3Preference.setAudioSampleRate(newValue));
+ }
+
+ return mAudioSampleRateComboBox;
+ }
+}
diff --git a/src/main/java/io/github/dsheirer/gui/preference/playback/PlaybackPreferenceEditor.java b/src/main/java/io/github/dsheirer/gui/preference/playback/PlaybackPreferenceEditor.java
index b2d9c706..91c09ac2 100644
--- a/src/main/java/io/github/dsheirer/gui/preference/playback/PlaybackPreferenceEditor.java
+++ b/src/main/java/io/github/dsheirer/gui/preference/playback/PlaybackPreferenceEditor.java
@@ -1,6 +1,6 @@
/*
* *****************************************************************************
- * Copyright (C) 2014-2020 Dennis Sheirer
+ * Copyright (C) 2014-2022 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,10 +19,7 @@
package io.github.dsheirer.gui.preference.playback;
-import com.google.common.eventbus.Subscribe;
import io.github.dsheirer.audio.AudioFormats;
-import io.github.dsheirer.eventbus.MyEventBus;
-import io.github.dsheirer.preference.PreferenceType;
import io.github.dsheirer.preference.UserPreferences;
import io.github.dsheirer.preference.playback.PlaybackPreference;
import io.github.dsheirer.source.mixer.MixerChannelConfiguration;
@@ -410,7 +407,7 @@ public class PlaybackPreferenceEditor extends HBox
byte[] bytes = buffer.array();
- DataLine.Info info = new DataLine.Info(Clip.class, AudioFormats.PCM_SIGNED_8KHZ_16BITS_MONO);
+ DataLine.Info info = new DataLine.Info(Clip.class, AudioFormats.PCM_SIGNED_8_KHZ_16BITS_MONO);
if(!AudioSystem.isLineSupported(info))
{
@@ -421,7 +418,7 @@ public class PlaybackPreferenceEditor extends HBox
try
{
Clip clip = (Clip)AudioSystem.getLine(info);
- clip.open(AudioFormats.PCM_SIGNED_8KHZ_16BITS_MONO, bytes, 0, bytes.length);
+ clip.open(AudioFormats.PCM_SIGNED_8_KHZ_16BITS_MONO, bytes, 0, bytes.length);
clip.start();
}
catch(Exception e)
diff --git a/src/main/java/io/github/dsheirer/preference/PreferenceType.java b/src/main/java/io/github/dsheirer/preference/PreferenceType.java
index d9309dea..355ff838 100644
--- a/src/main/java/io/github/dsheirer/preference/PreferenceType.java
+++ b/src/main/java/io/github/dsheirer/preference/PreferenceType.java
@@ -29,6 +29,7 @@ public enum PreferenceType
DIRECTORY,
DUPLICATE_CALL_DETECTION,
JMBE_LIBRARY,
+ MP3,
MULTI_FREQUENCY,
PLAYLIST,
PLAYBACK,
diff --git a/src/main/java/io/github/dsheirer/preference/UserPreferences.java b/src/main/java/io/github/dsheirer/preference/UserPreferences.java
index bc247a07..3f10b316 100644
--- a/src/main/java/io/github/dsheirer/preference/UserPreferences.java
+++ b/src/main/java/io/github/dsheirer/preference/UserPreferences.java
@@ -27,6 +27,7 @@ import io.github.dsheirer.preference.duplicate.DuplicateCallDetectionPreference;
import io.github.dsheirer.preference.event.DecodeEventPreference;
import io.github.dsheirer.preference.identifier.TalkgroupFormatPreference;
import io.github.dsheirer.preference.javafx.JavaFxPreferences;
+import io.github.dsheirer.preference.mp3.MP3Preference;
import io.github.dsheirer.preference.playback.PlaybackPreference;
import io.github.dsheirer.preference.playlist.PlaylistPreference;
import io.github.dsheirer.preference.radioreference.RadioReferencePreference;
@@ -60,6 +61,7 @@ public class UserPreferences implements Listener
private DirectoryPreference mDirectoryPreference;
private DuplicateCallDetectionPreference mDuplicateCallDetectionPreference;
private JmbeLibraryPreference mJmbeLibraryPreference;
+ private MP3Preference mMP3Preference;
private PlaybackPreference mPlaybackPreference;
private PlaylistPreference mPlaylistPreference;
private RadioReferencePreference mRadioReferencePreference;
@@ -155,6 +157,14 @@ public class UserPreferences implements Listener
return mRecordPreference;
}
+ /**
+ * MP3 preferences
+ */
+ public MP3Preference getMP3Preference()
+ {
+ return mMP3Preference;
+ }
+
/**
* Identifier preferences
*/
@@ -199,6 +209,7 @@ public class UserPreferences implements Listener
mDirectoryPreference = new DirectoryPreference(this::receive);
mDuplicateCallDetectionPreference = new DuplicateCallDetectionPreference(this::receive);
mJmbeLibraryPreference = new JmbeLibraryPreference(this::receive);
+ mMP3Preference = new MP3Preference(this::receive);
mPlaybackPreference = new PlaybackPreference(this::receive);
mPlaylistPreference = new PlaylistPreference(this::receive, mDirectoryPreference);
mRadioReferencePreference = new RadioReferencePreference(this::receive);
diff --git a/src/main/java/io/github/dsheirer/preference/mp3/MP3Preference.java b/src/main/java/io/github/dsheirer/preference/mp3/MP3Preference.java
new file mode 100644
index 00000000..355350a3
--- /dev/null
+++ b/src/main/java/io/github/dsheirer/preference/mp3/MP3Preference.java
@@ -0,0 +1,131 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see updateListener)
+ {
+ super(updateListener);
+ }
+
+ @Override
+ public PreferenceType getPreferenceType()
+ {
+ return PreferenceType.MP3;
+ }
+
+
+ /**
+ * MP3 Setting
+ */
+ public MP3Setting getMP3Setting()
+ {
+ if(mMP3Setting == null)
+ {
+ try
+ {
+ String setting = mPreferences.get(PREFERENCE_KEY_AUDIO_MP3_SETTING, MP3Setting.getDefault().name());
+ mMP3Setting = MP3Setting.valueOf(setting);
+ }
+ catch(Exception e)
+ {
+ mLog.error("Error parsing mp3 setting preference", e);
+ }
+
+ if(mMP3Setting == null)
+ {
+ mMP3Setting = MP3Setting.getDefault();
+ }
+ }
+
+ return mMP3Setting;
+ }
+
+ /**
+ * Sets the MP3 setting preference
+ */
+ public void setMP3Setting(MP3Setting mp3Setting)
+ {
+ mMP3Setting = mp3Setting;
+ mPreferences.put(PREFERENCE_KEY_AUDIO_MP3_SETTING, mp3Setting.name());
+ notifyPreferenceUpdated();
+ }
+
+ /**
+ * Preferred audio sample rate for input to the LAME MP3 encoder
+ */
+ public AudioSampleRate getAudioSampleRate()
+ {
+ if(mAudioSampleRate == null)
+ {
+ try
+ {
+ String rate = mPreferences.get(PREFERENCE_KEY_AUDIO_MP3_SAMPLE_RATE, AudioSampleRate.getDefault().name());
+ mAudioSampleRate = AudioSampleRate.valueOf(rate);
+ }
+ catch(Exception e)
+ {
+ mLog.error("Error parsing mp3 setting preference", e);
+ }
+
+ if(mAudioSampleRate == null)
+ {
+ mAudioSampleRate = AudioSampleRate.getDefault();
+ }
+ }
+
+ return mAudioSampleRate;
+ }
+
+ /**
+ * Sets the input Audio Sample Rate preference
+ */
+ public void setAudioSampleRate(AudioSampleRate audioSampleRate)
+ {
+ mAudioSampleRate = audioSampleRate;
+ mPreferences.put(PREFERENCE_KEY_AUDIO_MP3_SAMPLE_RATE, mAudioSampleRate.name());
+ notifyPreferenceUpdated();
+ }
+}
diff --git a/src/main/java/io/github/dsheirer/record/AudioRecordingManager.java b/src/main/java/io/github/dsheirer/record/AudioRecordingManager.java
index 2120d1df..05e14018 100644
--- a/src/main/java/io/github/dsheirer/record/AudioRecordingManager.java
+++ b/src/main/java/io/github/dsheirer/record/AudioRecordingManager.java
@@ -1,6 +1,6 @@
/*
* *****************************************************************************
- * Copyright (C) 2014-2020 Dennis Sheirer
+ * Copyright (C) 2014-2022 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -152,7 +152,7 @@ public class AudioRecordingManager implements Listener
try
{
- AudioSegmentRecorder.record(audioSegment, path, recordFormat);
+ AudioSegmentRecorder.record(audioSegment, path, recordFormat, mUserPreferences);
}
catch(IOException ioe)
{
diff --git a/src/main/java/io/github/dsheirer/record/AudioSegmentRecorder.java b/src/main/java/io/github/dsheirer/record/AudioSegmentRecorder.java
index ca9fb1f2..bbbce446 100644
--- a/src/main/java/io/github/dsheirer/record/AudioSegmentRecorder.java
+++ b/src/main/java/io/github/dsheirer/record/AudioSegmentRecorder.java
@@ -1,6 +1,6 @@
/*
* *****************************************************************************
- * Copyright (C) 2014-2020 Dennis Sheirer
+ * Copyright (C) 2014-2022 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,7 +21,10 @@ package io.github.dsheirer.record;
import io.github.dsheirer.audio.AudioFormats;
import io.github.dsheirer.audio.AudioSegment;
+import io.github.dsheirer.audio.convert.AudioSampleRate;
import io.github.dsheirer.audio.convert.MP3AudioConverter;
+import io.github.dsheirer.audio.convert.MP3Setting;
+import io.github.dsheirer.preference.UserPreferences;
import io.github.dsheirer.record.wave.AudioMetadata;
import io.github.dsheirer.record.wave.AudioMetadataUtils;
import io.github.dsheirer.record.wave.WaveWriter;
@@ -34,6 +37,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.nio.file.Path;
+import java.util.List;
import java.util.Map;
/**
@@ -53,12 +57,13 @@ public class AudioSegmentRecorder
* @param recordFormat to use (WAVE, MP3)
* @throws IOException on any errors
*/
- public static void record(AudioSegment audioSegment, Path path, RecordFormat recordFormat) throws IOException
+ public static void record(AudioSegment audioSegment, Path path, RecordFormat recordFormat,
+ UserPreferences userPreferences) throws IOException
{
switch(recordFormat)
{
case MP3:
- recordMP3(audioSegment, path);
+ recordMP3(audioSegment, path, userPreferences);
break;
case WAVE:
recordWAVE(audioSegment, path);
@@ -74,7 +79,7 @@ public class AudioSegmentRecorder
* @param path for the recording
* @throws IOException on any errors
*/
- public static void recordMP3(AudioSegment audioSegment, Path path) throws IOException
+ public static void recordMP3(AudioSegment audioSegment, Path path, UserPreferences userPreferences) throws IOException
{
if(audioSegment.hasAudio())
{
@@ -88,15 +93,24 @@ public class AudioSegmentRecorder
outputStream.write(id3Bytes);
//Convert audio to MP3 and write to file
- MP3AudioConverter converter = new MP3AudioConverter(MP3_BIT_RATE, CONSTANT_BIT_RATE);
- byte[] mp3 = converter.convertAudio(audioSegment.getAudioBuffers());
- outputStream.write(mp3);
+ AudioSampleRate audioSampleRate = userPreferences.getMP3Preference().getAudioSampleRate();
+ MP3Setting mp3Setting = userPreferences.getMP3Preference().getMP3Setting();
- byte[] lastFrame = converter.flush();
-
- if(lastFrame != null && lastFrame.length > 0)
+ MP3AudioConverter converter = new MP3AudioConverter(audioSampleRate, mp3Setting);
+ List mp3Frames = converter.convert(audioSegment.getAudioBuffers());
+ for(byte[] mp3Frame: mp3Frames)
{
- outputStream.write(lastFrame);
+ outputStream.write(mp3Frame);
+ }
+
+ List lastFrames = converter.flush();
+
+ if(!lastFrames.isEmpty())
+ {
+ for(byte[] lastFrame: lastFrames)
+ {
+ outputStream.write(lastFrame);
+ }
}
outputStream.flush();
@@ -114,7 +128,7 @@ public class AudioSegmentRecorder
{
if(audioSegment.hasAudio())
{
- WaveWriter writer = new WaveWriter(AudioFormats.PCM_SIGNED_8KHZ_16BITS_MONO, path);
+ WaveWriter writer = new WaveWriter(AudioFormats.PCM_SIGNED_8_KHZ_16BITS_MONO, path);
for(float[] audioBuffer: audioSegment.getAudioBuffers())
{
diff --git a/src/main/java/io/github/dsheirer/source/mixer/MixerManager.java b/src/main/java/io/github/dsheirer/source/mixer/MixerManager.java
index 2379ede3..7de642ee 100644
--- a/src/main/java/io/github/dsheirer/source/mixer/MixerManager.java
+++ b/src/main/java/io/github/dsheirer/source/mixer/MixerManager.java
@@ -76,7 +76,7 @@ public class MixerManager
if(channel == MixerChannel.MONO)
{
DataLine.Info info = new DataLine.Info(TargetDataLine.class,
- AudioFormats.PCM_SIGNED_8KHZ_16BITS_MONO);
+ AudioFormats.PCM_SIGNED_8_KHZ_16BITS_MONO);
TargetDataLine dataLine;
@@ -86,7 +86,7 @@ public class MixerManager
if(dataLine != null)
{
- return new RealMixerSource(dataLine, AudioFormats.PCM_SIGNED_8KHZ_16BITS_MONO,
+ return new RealMixerSource(dataLine, AudioFormats.PCM_SIGNED_8_KHZ_16BITS_MONO,
new RealShortAdapter());
}
}
@@ -307,7 +307,7 @@ public class MixerManager
boolean stereoSupported = mixer.isLineSupported(stereoInfo);
DataLine.Info monoInfo = new DataLine.Info(TargetDataLine.class,
- AudioFormats.PCM_SIGNED_8KHZ_16BITS_MONO);
+ AudioFormats.PCM_SIGNED_8_KHZ_16BITS_MONO);
boolean monoSupported = mixer.isLineSupported(monoInfo);
@@ -341,7 +341,7 @@ public class MixerManager
boolean stereoSupported = mixer.isLineSupported(stereoInfo);
- DataLine.Info monoInfo = new DataLine.Info(SourceDataLine.class, AudioFormats.PCM_SIGNED_8KHZ_16BITS_MONO);
+ DataLine.Info monoInfo = new DataLine.Info(SourceDataLine.class, AudioFormats.PCM_SIGNED_8_KHZ_16BITS_MONO);
boolean monoSupported = mixer.isLineSupported(monoInfo);