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

Merge pull request #428 from DSheirer/377-npe-in-trellis-decoder

Browse Source 
377 NPE in P25 3/4 Rate Trellis Decoder
This commit is contained in:
Denny Sheirer
2018-09-22 02:53:16 -04:00
committed by GitHub
parent d752917073 2771c28dba
commit cc209683bd
3 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/io/github/dsheirer/module/decode/p25/Trellis_3_4_Rate.java
View File

@@ -351,8 +351,12 @@ public class Trellis_3_4_Rate
{ {
Node current = getLastNode(); Node current = getLastNode();
Tribit input = INPUT_FROM_CONSTELLATION_MAP Tribit input = null;
.get( con )[ current.getState().getValue() ];
if(current != null)
{
input = INPUT_FROM_CONSTELLATION_MAP.get( con )[ current.getState().getValue() ];
}
/* A non-null input tribit from the lookup table is valid, otherwise /* A non-null input tribit from the lookup table is valid, otherwise
* create 8 alternate branches from the original path to explore * create 8 alternate branches from the original path to explore

4
src/main/java/io/github/dsheirer/source/tuner/channel/CICTunerChannelSource.java
View File

@@ -18,7 +18,7 @@ package io.github.dsheirer.source.tuner.channel;
import io.github.dsheirer.dsp.filter.cic.ComplexPrimeCICDecimate; import io.github.dsheirer.dsp.filter.cic.ComplexPrimeCICDecimate;
import io.github.dsheirer.dsp.filter.design.FilterDesignException; import io.github.dsheirer.dsp.filter.design.FilterDesignException;
import io.github.dsheirer.dsp.mixer.IOscillator; import io.github.dsheirer.dsp.mixer.IOscillator;
import io.github.dsheirer.dsp.mixer.LowPhaseNoiseOscillator; import io.github.dsheirer.dsp.mixer.Oscillator;
import io.github.dsheirer.sample.IOverflowListener; import io.github.dsheirer.sample.IOverflowListener;
import io.github.dsheirer.sample.Listener; import io.github.dsheirer.sample.Listener;
import io.github.dsheirer.sample.buffer.OverflowableReusableBufferTransferQueue; import io.github.dsheirer.sample.buffer.OverflowableReusableBufferTransferQueue;
@@ -81,7 +81,7 @@ public class CICTunerChannelSource extends TunerChannelSource implements Listene
mTunerFrequency = tunerChannel.getFrequency(); mTunerFrequency = tunerChannel.getFrequency();
long frequencyOffset = mTunerFrequency - getTunerChannel().getFrequency(); long frequencyOffset = mTunerFrequency - getTunerChannel().getFrequency();
mFrequencyCorrectionMixer = new LowPhaseNoiseOscillator(frequencyOffset, sampleRate); mFrequencyCorrectionMixer = new Oscillator(frequencyOffset, sampleRate);
} }
/** /**

29
src/main/java/io/github/dsheirer/source/tuner/channel/TunerChannelSource.java
View File

@@ -286,8 +286,22 @@ public abstract class TunerChannelSource extends ComplexSource implements ISourc
{ {
if(!mStopped) if(!mStopped)
{ {
getHeartbeatManager().broadcast(); try
processSamples(); {
getHeartbeatManager().broadcast();
}
catch(Throwable t)
{
mLog.error("Error while sending heartbeat", t);
}
try
{
processSamples();
}
catch(Throwable t)
{
mLog.error("Error while processing samples", t);
}
} }
if(mStopped) if(mStopped)
@@ -300,8 +314,15 @@ public abstract class TunerChannelSource extends ComplexSource implements ISourc
mScheduledFuture = null; mScheduledFuture = null;
getHeartbeatManager().broadcast(); try
performDisposal(); {
getHeartbeatManager().broadcast();
performDisposal();
}
catch(Throwable t)
{
mLog.error("Error during final shutdown processing of samples", t);
}
} }
} }
} }