GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-14 01:27:34 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#2006 AudioOutput now requests a new source data line from the mixer when it detects that the line no longer accepts audio byte data. (#2011)

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2024-10-13 11:58:03 -04:00
committed by GitHub
parent 1b3ce431e6
commit 67f91b80f2
1 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/io/github/dsheirer/audio/playback/AudioOutput.java
View File

@@ -25,6 +25,7 @@ import io.github.dsheirer.controller.NamingThreadFactory;
import io.github.dsheirer.eventbus.MyEventBus; import io.github.dsheirer.eventbus.MyEventBus;
import io.github.dsheirer.identifier.IdentifierCollection; import io.github.dsheirer.identifier.IdentifierCollection;
import io.github.dsheirer.identifier.IdentifierUpdateNotification; import io.github.dsheirer.identifier.IdentifierUpdateNotification;
import io.github.dsheirer.log.LoggingSuppressor;
import io.github.dsheirer.preference.PreferenceType; import io.github.dsheirer.preference.PreferenceType;
import io.github.dsheirer.preference.UserPreferences; import io.github.dsheirer.preference.UserPreferences;
import io.github.dsheirer.sample.Broadcaster; import io.github.dsheirer.sample.Broadcaster;
@@ -58,6 +59,7 @@ import javax.sound.sampled.SourceDataLine;
public abstract class AudioOutput implements LineListener, Listener<IdentifierUpdateNotification> public abstract class AudioOutput implements LineListener, Listener<IdentifierUpdateNotification>
{ {
private final static Logger mLog = LoggerFactory.getLogger(AudioOutput.class); private final static Logger mLog = LoggerFactory.getLogger(AudioOutput.class);
private static final LoggingSuppressor LOGGING_SUPPRESSOR = new LoggingSuppressor(mLog);
private int mBufferStartThreshold; private int mBufferStartThreshold;
private int mBufferStopThreshold; private int mBufferStopThreshold;
private Listener<IdentifierCollection> mIdentifierCollectionListener; private Listener<IdentifierCollection> mIdentifierCollectionListener;
@@ -83,6 +85,7 @@ public abstract class AudioOutput implements LineListener, Listener<IdentifierUp
private long mOutputLastTimestamp = 0; private long mOutputLastTimestamp = 0;
private static final long STALE_PLAYBACK_THRESHOLD_MS = 500; private static final long STALE_PLAYBACK_THRESHOLD_MS = 500;
private AudioFormat mAudioFormat; private AudioFormat mAudioFormat;
private Line.Info mLineInfo;
private int mRequestedBufferSize; private int mRequestedBufferSize;
/** /**
@@ -109,11 +112,12 @@ public abstract class AudioOutput implements LineListener, Listener<IdentifierUp
mUserPreferences = userPreferences; mUserPreferences = userPreferences;
mDropDuplicates = mUserPreferences.getDuplicateCallDetectionPreference().isDuplicatePlaybackSuppressionEnabled(); mDropDuplicates = mUserPreferences.getDuplicateCallDetectionPreference().isDuplicatePlaybackSuppressionEnabled();
mAudioFormat = audioFormat; mAudioFormat = audioFormat;
mLineInfo = lineInfo;
mRequestedBufferSize = requestedBufferSize; mRequestedBufferSize = requestedBufferSize;
try try
{ {
mOutput = (SourceDataLine) mMixer.getLine(lineInfo); mOutput = (SourceDataLine) mMixer.getLine(mLineInfo);
if(mOutput != null) if(mOutput != null)
{ {
@@ -270,6 +274,12 @@ public abstract class AudioOutput implements LineListener, Listener<IdentifierUp
*/ */
private void playAudio(ByteBuffer buffer) private void playAudio(ByteBuffer buffer)
{ {
if(mOutput == null)
{
LOGGING_SUPPRESSOR.error("null output", 5, "Audio Output is null - ignoring audio playback request");
return;
}
if(buffer != null) if(buffer != null)
{ {
int wrote = 0; int wrote = 0;
@@ -298,6 +308,29 @@ public abstract class AudioOutput implements LineListener, Listener<IdentifierUp
{ {
mOutput.close(); mOutput.close();
try
{
mOutput = (SourceDataLine)mMixer.getLine(mLineInfo);
if(mOutput != null)
{
LOGGING_SUPPRESSOR.info("reopen audio output success", 5,
"Closed and reopened audio output - success - mOutput is not null");
}
else
{
LOGGING_SUPPRESSOR.info("reopen audio output fail", 5,
"Closed and reopened audio output - fail - mOutput is null");
return;
}
}
catch(LineUnavailableException lue)
{
LOGGING_SUPPRESSOR.error("reopen fail for lua", 3, "Attempt to reopen " +
"audio source data line failed", lue);
return;
}
try try
{ {
mOutput.open(mAudioFormat, mRequestedBufferSize); mOutput.open(mAudioFormat, mRequestedBufferSize);
@@ -315,7 +348,8 @@ public abstract class AudioOutput implements LineListener, Listener<IdentifierUp
} }
catch(IllegalArgumentException iae) catch(IllegalArgumentException iae)
{ {
mLog.warn("Couldn't obtain MASTER GAIN control for stereo line [" + getChannelName() + "]"); mLog.warn("Couldn't obtain MASTER GAIN control for stereo line [" + getChannelName() +
"] after reopening the source data line");
} }
try try
@@ -325,7 +359,8 @@ public abstract class AudioOutput implements LineListener, Listener<IdentifierUp
} }
catch(IllegalArgumentException iae) catch(IllegalArgumentException iae)
{ {
mLog.warn("Couldn't obtain MUTE control for stereo line [" + getChannelName() + "]"); mLog.warn("Couldn't obtain MUTE control for stereo line [" + getChannelName() +
"] after reopening the source data line");
} }
mAudioStartEvent = new AudioEvent(AudioEvent.Type.AUDIO_STARTED, getChannelName()); mAudioStartEvent = new AudioEvent(AudioEvent.Type.AUDIO_STARTED, getChannelName());
@@ -334,8 +369,10 @@ public abstract class AudioOutput implements LineListener, Listener<IdentifierUp
} }
catch(LineUnavailableException e) catch(LineUnavailableException e)
{ {
mLog.error("Couldn't obtain audio source data line for audio output - mixer [" + LOGGING_SUPPRESSOR.error("failed reopen source data line lua", 3,
"Failed to (re)open the source data line for audio output - mixer [" +
mMixer.getMixerInfo().getName() + "]"); mMixer.getMixerInfo().getName() + "]");
return;
} }
} }
} }