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

16
src/main/java/io/github/dsheirer/source/mixer/MixerManager.java
View File

@@ -76,7 +76,7 @@ public class MixerManager
if(channel == MixerChannel.MONO)
{
DataLine.Info info = new DataLine.Info(TargetDataLine.class,
AudioFormats.PCM_SIGNED_8_KHZ_16BITS_MONO);
AudioFormats.PCM_SIGNED_8000_HZ_16_BIT_MONO);
TargetDataLine dataLine;
@@ -86,7 +86,7 @@ public class MixerManager
if(dataLine != null)
{
return new RealMixerSource(dataLine, AudioFormats.PCM_SIGNED_8_KHZ_16BITS_MONO,
return new RealMixerSource(dataLine, AudioFormats.PCM_SIGNED_8000_HZ_16_BIT_MONO,
new RealShortAdapter());
}
}
@@ -100,7 +100,7 @@ public class MixerManager
else //STEREO
{
DataLine.Info info = new DataLine.Info(TargetDataLine.class,
AudioFormats.PCM_SIGNED_8KHZ_16BITS_STEREO);
AudioFormats.PCM_SIGNED_8000_HZ_16BITS_STEREO);
TargetDataLine dataLine;
@@ -110,7 +110,7 @@ public class MixerManager
if(dataLine != null)
{
return new RealMixerSource(dataLine, AudioFormats.PCM_SIGNED_8KHZ_16BITS_STEREO,
return new RealMixerSource(dataLine, AudioFormats.PCM_SIGNED_8000_HZ_16BITS_STEREO,
new RealChannelShortAdapter(mixerConfig.getChannel()));
}
}
@@ -302,12 +302,12 @@ public class MixerManager
private static EnumSet<MixerChannel> getSupportedTargetChannels(Mixer mixer)
{
DataLine.Info stereoInfo = new DataLine.Info(TargetDataLine.class,
AudioFormats.PCM_SIGNED_8KHZ_16BITS_STEREO);
AudioFormats.PCM_SIGNED_8000_HZ_16BITS_STEREO);
boolean stereoSupported = mixer.isLineSupported(stereoInfo);
DataLine.Info monoInfo = new DataLine.Info(TargetDataLine.class,
AudioFormats.PCM_SIGNED_8_KHZ_16BITS_MONO);
AudioFormats.PCM_SIGNED_8000_HZ_16_BIT_MONO);
boolean monoSupported = mixer.isLineSupported(monoInfo);
@@ -337,11 +337,11 @@ public class MixerManager
List<MixerChannel> channels = new ArrayList<>();
DataLine.Info stereoInfo = new DataLine.Info(SourceDataLine.class,
AudioFormats.PCM_SIGNED_8KHZ_16BITS_STEREO);
AudioFormats.PCM_SIGNED_8000_HZ_16BITS_STEREO);
boolean stereoSupported = mixer.isLineSupported(stereoInfo);
DataLine.Info monoInfo = new DataLine.Info(SourceDataLine.class, AudioFormats.PCM_SIGNED_8_KHZ_16BITS_MONO);
DataLine.Info monoInfo = new DataLine.Info(SourceDataLine.class, AudioFormats.PCM_SIGNED_8000_HZ_16_BIT_MONO);
boolean monoSupported = mixer.isLineSupported(monoInfo);