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

Revert "#2356 Muted audio channel can leak audio"

Browse Source 
This reverts commit 185df1735a.
This commit is contained in:
denny
2026-02-09 02:54:23 -05:00
parent 2f5c165aec
commit 7f9dc86b23
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/io/github/dsheirer/audio/playback/AudioChannel.java
View File

@@ -170,16 +170,7 @@ public class AudioChannel implements Listener<IdentifierUpdateNotification>
{ {
if(mAudioBuffer.isFull()) if(mAudioBuffer.isFull())
{ {
float[] audio = mAudioBuffer.get(); return mAudioBuffer.get();
if(isMuted())
{
return new float[SAMPLES_PER_INTERVAL];
}
else
{
return audio;
}
} }
if(mCurrentAudioSegment == null) if(mCurrentAudioSegment == null)

10
src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1MessageFramer.java
View File

@@ -1,6 +1,6 @@
/* /*
* ***************************************************************************** * *****************************************************************************
* Copyright (C) 2014-2026 Dennis Sheirer * Copyright (C) 2014-2025 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@@ -75,6 +75,7 @@ public class P25P1MessageFramer
private int mDetectedSyncBitErrors = 0; private int mDetectedSyncBitErrors = 0;
private final P25P1ChannelStatusProcessor mChannelStatusProcessor = new P25P1ChannelStatusProcessor(); private final P25P1ChannelStatusProcessor mChannelStatusProcessor = new P25P1ChannelStatusProcessor();
private PDUSequence mPDUSequence; private PDUSequence mPDUSequence;
private int mDebugSymbolCount = 0;
/** /**
* Constructs an instance * Constructs an instance
@@ -122,6 +123,11 @@ public class P25P1MessageFramer
*/ */
public void syncDetected() public void syncDetected()
{ {
if(mDebugSymbolCount > 2204767)
{
int a = 0;
}
mSyncDetected = true; mSyncDetected = true;
mNIDPointer = 0; mNIDPointer = 0;
} }
@@ -681,6 +687,7 @@ public class P25P1MessageFramer
*/ */
private void broadcast(IMessage message) private void broadcast(IMessage message)
{ {
// System.out.println("Symbols: " + mDebugSymbolCount);
if(mRunning && message != null && mMessageListener != null) if(mRunning && message != null && mMessageListener != null)
{ {
mMessageListener.receive(message); mMessageListener.receive(message);
@@ -838,6 +845,7 @@ public class P25P1MessageFramer
//flag it as invalid NID when this happens. The NAC tracker will give us a value of 0 until it has enough //flag it as invalid NID when this happens. The NAC tracker will give us a value of 0 until it has enough
//observations of a valid NID value. //observations of a valid NID value.
mNACTracker.track(nac); mNACTracker.track(nac);
// System.out.println("\t\t" + mDebugSymbolCount + " VALID NID - NAC:" + nac + " DUID:" + duid);
nidDetected(nac, duid, nid.getCorrectedBitCount()); nidDetected(nac, duid, nid.getCorrectedBitCount());
return true; return true;
} }