GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 08:37:25 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#1170 resolves issue with MP3 encoded audio raspy. Adds auto-clipping of PCM audio prior to encoding and adds 4x new 32-bit input sample rate selections to choose from, in addition to original 4x 16-bit input formats. (#1171)

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2022-03-16 05:00:07 -04:00
committed by GitHub
parent 90bc321aca
commit 7749fd10f1
23 changed files with 245 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/io/github/dsheirer/preference/mp3/MP3Preference.java
View File

@@ -19,7 +19,7 @@
package io.github.dsheirer.preference.mp3;
import io.github.dsheirer.audio.convert.AudioSampleRate;
import io.github.dsheirer.audio.convert.InputAudioFormat;
import io.github.dsheirer.audio.convert.MP3Setting;
import io.github.dsheirer.preference.Preference;
import io.github.dsheirer.preference.PreferenceType;
@@ -38,7 +38,7 @@ public class MP3Preference extends Preference
private static final String PREFERENCE_KEY_AUDIO_MP3_SAMPLE_RATE = "audio.mp3.sample.rate";
private final static Logger mLog = LoggerFactory.getLogger(MP3Preference.class);
private Preferences mPreferences = Preferences.userNodeForPackage(MP3Preference.class);
private AudioSampleRate mAudioSampleRate;
private InputAudioFormat mInputAudioFormat;
private MP3Setting mMP3Setting;
/**
@@ -96,36 +96,36 @@ public class MP3Preference extends Preference
/**
* Preferred audio sample rate for input to the LAME MP3 encoder
*/
public AudioSampleRate getAudioSampleRate()
public InputAudioFormat getAudioSampleRate()
{
if(mAudioSampleRate == null)
if(mInputAudioFormat == null)
{
try
{
String rate = mPreferences.get(PREFERENCE_KEY_AUDIO_MP3_SAMPLE_RATE, AudioSampleRate.getDefault().name());
mAudioSampleRate = AudioSampleRate.valueOf(rate);
String rate = mPreferences.get(PREFERENCE_KEY_AUDIO_MP3_SAMPLE_RATE, InputAudioFormat.getDefault().name());
mInputAudioFormat = InputAudioFormat.valueOf(rate);
}
catch(Exception e)
{
mLog.error("Error parsing mp3 setting preference", e);
}
if(mAudioSampleRate == null)
if(mInputAudioFormat == null)
{
mAudioSampleRate = AudioSampleRate.getDefault();
mInputAudioFormat = InputAudioFormat.getDefault();
}
}
return mAudioSampleRate;
return mInputAudioFormat;
}
/**
* Sets the input Audio Sample Rate preference
*/
public void setAudioSampleRate(AudioSampleRate audioSampleRate)
public void setAudioSampleRate(InputAudioFormat inputAudioFormat)
{
mAudioSampleRate = audioSampleRate;
mPreferences.put(PREFERENCE_KEY_AUDIO_MP3_SAMPLE_RATE, mAudioSampleRate.name());
mInputAudioFormat = inputAudioFormat;
mPreferences.put(PREFERENCE_KEY_AUDIO_MP3_SAMPLE_RATE, mInputAudioFormat.name());
notifyPreferenceUpdated();
}
}