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

Memory/CPU performance improvement and Audio/Mixer source restructuring

Browse Source 
Converted to use float primitives and to keep samples in buffer format until the sample rate is decimated to 48kHz.  
Added new non-recursive, CIC decimation filter -- untested

Updated sound card/mixer input source management.  Now testing for mono/stereo support for each card and limiting channel choices accordingly.  Separated the mixersource into a ComplexMixer and and SimplexMixerSource.  The ComplexMixer is used for sound card based tuners like the funcube.  The SimplexMixerSource is used for demodulated sound card inputs.

Interfaces for sample handling - standardized on using 'Complex' to indicate I/Q samples and 'Simplex' to indicate demodulated float samples.  The processing chain now accepts either a decimated (48k) list of complex samples from a tuner channel source, or a 48k simplex buffer (array of demodulated float samples).

Resolved issue with HackRF tuner not applying tuner configuration information.
This commit is contained in:
dennis.sheirer
2014-10-26 10:11:30 +00:00
parent 0ad710fea2
commit e61c3a891c
71 changed files with 1754 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/decode/p25/P25Decoder.java
View File

@@ -24,12 +24,11 @@ import instrument.tap.stream.FloatTap;
import java.util.ArrayList;
import java.util.List;
import sample.Listener;
import sample.simplex.SimplexSampleListener;
import source.Source.SampleType;
import alias.AliasList;
import decode.Decoder;
import decode.DecoderType;
import dsp.afc.AutomaticFrequencyControl;
import dsp.filter.DCRemovalFilter2;
import dsp.fsk.C4FMDecoder;
import dsp.nbfm.FilteringNBFMDemodulator;
@@ -84,12 +83,12 @@ public class P25Decoder extends Decoder implements Instrumentable
* Route the demodulated, filtered samples back to this class to send
* to all registered listeners
*/
mDCRemovalFilter.setListener( this.getFloatReceiver() );
mDCRemovalFilter.setListener( this.getSimplexReceiver() );
}
mC4FMDecoder = new C4FMDecoder();
addFloatListener( mC4FMDecoder );
addSimplexSampleListener( mC4FMDecoder );
}
@Override
@@ -121,8 +120,8 @@ public class P25Decoder extends Decoder implements Instrumentable
{
case TAP_DEMOD_TO_DECODER:
FloatTap demodTap = (FloatTap)tap;
removeFloatListener( mC4FMDecoder );
addFloatListener( demodTap );
removeSimplexListener( mC4FMDecoder );
addSimplexSampleListener( demodTap );
demodTap.setListener( mC4FMDecoder );
break;
}
@@ -137,17 +136,16 @@ public class P25Decoder extends Decoder implements Instrumentable
{
case TAP_DEMOD_TO_DECODER:
FloatTap demodTap = (FloatTap)tap;
removeFloatListener( demodTap );
removeSimplexListener( demodTap );
demodTap.removeListener( mC4FMDecoder );
addFloatListener( mC4FMDecoder );
addSimplexSampleListener( mC4FMDecoder );
break;
}
}
@Override
public void addUnfilteredFloatListener( Listener<Float> listener )
public void addUnfilteredSimplexSampleListener( SimplexSampleListener listener )
{
// TODO Auto-generated method stub
}
}