GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-09 15:17:24 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#2364 Audio Playback supports 64-line alsa mixers as stereo output (#2374)

Browse Source 
Co-authored-by: denny <dennis.sheirer@gmail.com>
This commit is contained in:
Denny Sheirer
2026-02-19 03:54:10 -05:00
committed by GitHub
parent de0e722f0c
commit a053315675
2 changed files with 72 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/io/github/dsheirer/audio/playback/AudioPlaybackDeviceDescriptor.java
View File

@@ -50,9 +50,25 @@ public class AudioPlaybackDeviceDescriptor implements Comparable<AudioPlaybackDe
getChannelDescription(getAudioFormat());
}
/**
* Cleans the mixer description to reformat/reword certain mixer descriptions
* @param mixerInfo containing a description
* @return cleaned description
*/
private static String getCleanDescription(Mixer.Info mixerInfo)
{
return mixerInfo.getDescription().replace("Direct Audio Device: ", "");
if(mixerInfo.getDescription().contains("Direct Audio Device: "))
{
return mixerInfo.getDescription().replace("Direct Audio Device: ", "");
}
else if(mixerInfo.getDescription().contains("alsa_playback.java"))
{
return "Default (Java/ALSA)";
}
else
{
return mixerInfo.getDescription();
}
}
/**

69
src/main/java/io/github/dsheirer/audio/playback/AudioPlaybackDeviceManager.java
View File

@@ -88,25 +88,66 @@ public class AudioPlaybackDeviceManager
{
for(AudioFormat audioFormat : dataLineInfo.getFormats())
{
if(!audioFormat.isBigEndian() &&
audioFormat.getSampleSizeInBits() == 16 &&
!discoveredFormats.contains(audioFormat) &&
audioFormat.getChannels() <= 2) //TODO: remove the 2 channels max restriction once supported
if(!audioFormat.isBigEndian() && audioFormat.getSampleSizeInBits() == 16 &&
!discoveredFormats.contains(audioFormat))
{
if(audioFormat.getSampleRate() == AudioSystem.NOT_SPECIFIED)
if(audioFormat.getChannels() == 1)
{
discoveredFormats.add(audioFormat);
//Modify the format for 8 kHz sample rate
AudioFormat updatedFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED,
8000, 16, audioFormat.getChannels(), audioFormat.getFrameSize(),
8000, false);
devices.add(new AudioPlaybackDeviceDescriptor(mixerInfo, updatedFormat));
if(audioFormat.getSampleRate() == AudioSystem.NOT_SPECIFIED)
{
discoveredFormats.add(audioFormat);
//Modify the format for 8 kHz sample rate
AudioFormat updatedFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED,
8000, 16, audioFormat.getChannels(), audioFormat.getFrameSize(),
8000, false);
devices.add(new AudioPlaybackDeviceDescriptor(mixerInfo, updatedFormat));
}
else if(audioFormat.getSampleRate() == 8000)
{
discoveredFormats.add(audioFormat);
devices.add(new AudioPlaybackDeviceDescriptor(mixerInfo, audioFormat));
}
}
else if(audioFormat.getSampleRate() == 8000)
//Stereo and 64-channel formats
else if(audioFormat.getChannels() == 2 || audioFormat.getChannels() > 8)
{
discoveredFormats.add(audioFormat);
devices.add(new AudioPlaybackDeviceDescriptor(mixerInfo, audioFormat));
if(audioFormat.getSampleRate() == AudioSystem.NOT_SPECIFIED)
{
discoveredFormats.add(audioFormat);
//Modify the format for 8 kHz sample rate, 2 channels, 4 bytes per frame
AudioFormat updatedFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED,
8000, 16, 2, 4,
8000, false);
devices.add(new AudioPlaybackDeviceDescriptor(mixerInfo, updatedFormat));
}
else if(audioFormat.getSampleRate() == 8000)
{
discoveredFormats.add(audioFormat);
//Modify the format for 8 kHz sample rate, 2 channels, 4 bytes per frame
AudioFormat updatedFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED,
audioFormat.getSampleRate(), 16, 2, 4,
audioFormat.getFrameRate(), false);
devices.add(new AudioPlaybackDeviceDescriptor(mixerInfo, updatedFormat));
}
}
//TODO: remove the 2 channels max restriction once supported
// else if(audioFormat.getChannels() > 2 && audioFormat.getChannels() <= 8)
// {
// if(audioFormat.getSampleRate() == AudioSystem.NOT_SPECIFIED)
// {
// discoveredFormats.add(audioFormat);
// //Modify the format for 8 kHz sample rate
// AudioFormat updatedFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED,
// 8000, 16, audioFormat.getChannels(), audioFormat.getFrameSize(),
// 8000, false);
// devices.add(new AudioPlaybackDeviceDescriptor(mixerInfo, updatedFormat));
// }
// else if(audioFormat.getSampleRate() == 8000)
// {
// discoveredFormats.add(audioFormat);
// devices.add(new AudioPlaybackDeviceDescriptor(mixerInfo, audioFormat));
// }
// }
}
}
}