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

Initial commit of redesigned internal processing and audio management.

Browse Source 
Note: Several of the decoders are currently non-functioning in this
commit.  If you want the latest functioning codebase, please checkout
the commit prior to this one.  All decoders will eventually be updated
with this new architecture.

Currently broken:
- Logging and recording
- Aux decoders (Fleetsync/MDC/LoJack/Tait)
- LTR/Passport decoders

Changes in this commit:
- Module architecture for decoders and components with central
provisioning by the DecoderFactory
- Transition from Complex sample stream processing to float buffer
processing for improved memory management
- Redesigned filter structures - to support buffers and streams
- Resolved several memory leak issues
- Universal sharing of the thread pool manager
- Added centralized audio management with call/user prioritization and
new gui with mute/volume controls
- Embedded audio metadata for eventual streaming support
- Redesigned ProcessingChain to support independent re-use
- Added new TrafficChannelManager to handle traffic channel allocations
- Traffic Channel pool size and Call timeout available in P25 and
MPT1327 configs
- Redesigned channel and decoder gui components
This commit is contained in:
denny
2015-09-01 07:10:26 -04:00
parent 538a299246
commit f4d8ea281d
570 changed files with 21578 additions and 17012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/instrument/gui/AudioSourceFrame.java
View File

@@ -34,7 +34,13 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTextField;
import message.MessageDirection;
import module.decode.Decoder;
import module.decode.DecoderType;
import module.decode.fleetsync2.Fleetsync2Decoder;
import module.decode.lj1200.LJ1200Decoder;
import module.decode.mdc1200.MDCDecoder;
import module.decode.p25.P25Decoder.Modulation;
import module.decode.tait.Tait1200Decoder;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
@@ -43,21 +49,6 @@ import org.slf4j.LoggerFactory;
import source.wave.WaveSource;
import source.wave.WaveSource.PositionListener;
import controller.ResourceManager;
import decode.Decoder;
import decode.DecoderType;
import decode.config.DecodeConfigLTRNet;
import decode.config.DecodeConfigMPT1327;
import decode.config.DecodeConfigPassport;
import decode.fleetsync2.Fleetsync2Decoder;
import decode.lj1200.LJ1200Decoder;
import decode.ltrnet.LTRNetDecoder;
import decode.mdc1200.MDCDecoder;
import decode.mpt1327.MPT1327Decoder;
import decode.mpt1327.MPT1327Decoder.Sync;
import decode.p25.P25Decoder;
import decode.p25.P25Decoder.Modulation;
import decode.passport.PassportDecoder;
import decode.tait.Tait1200Decoder;
public class AudioSourceFrame extends JInternalFrame implements PositionListener
{
@@ -188,25 +179,25 @@ public class AudioSourceFrame extends JInternalFrame implements PositionListener
decoder = new LJ1200Decoder( null );
break;
case LTR_NET:
decoder = new LTRNetDecoder( new DecodeConfigLTRNet(),
mSource.getSampleType(), null, MessageDirection.OSW );
// decoder = new LTRNetDecoder( new DecodeConfigLTRNet(),
// mSource.getSampleType(), null, MessageDirection.OSW );
break;
case MDC1200:
decoder = new MDCDecoder( null );
break;
case MPT1327:
decoder = new MPT1327Decoder( new DecodeConfigMPT1327(),
mSource.getSampleType(), null, Sync.NORMAL );
// decoder = new MPT1327Decoder( new DecodeConfigMPT1327(),
// mSource.getSampleType(), null, Sync.NORMAL );
break;
case PASSPORT:
decoder = new PassportDecoder( new DecodeConfigPassport(),
mSource.getSampleType(), null );
// decoder = new PassportDecoder( new DecodeConfigPassport(),
// mSource.getSampleType(), null );
break;
case P25_PHASE1:
ResourceManager rm = new ResourceManager();
decoder = new P25Decoder( rm, mSource.getSampleType(),
(Modulation)mComboModulations.getSelectedItem(), null );
// decoder = new P25Decoder( rm, mSource.getSampleType(),
// (Modulation)mComboModulations.getSelectedItem(), null );
break;
case TAIT_1200:
decoder = new Tait1200Decoder( null );

6
src/instrument/gui/ConstellationPanel.java
View File

@@ -29,11 +29,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sample.Listener;
import sample.complex.ComplexSample;
import sample.complex.Complex;
import source.wave.WaveSource.PositionListener;
public class ConstellationPanel extends JInternalFrame
implements PositionListener, Listener<ComplexSample>
implements PositionListener, Listener<Complex>
{
private static final long serialVersionUID = 1L;
private final static Logger mLog =
@@ -69,7 +69,7 @@ public class ConstellationPanel extends JInternalFrame
}
@Override
public void receive( ComplexSample sample )
public void receive( Complex sample )
{
mConstellation.receive( sample );
}

15
src/instrument/gui/DecoderViewFrame.java
View File

@@ -22,6 +22,8 @@ import instrument.tap.Tap;
import instrument.tap.TapViewPanel;
import instrument.tap.stream.BinaryTap;
import instrument.tap.stream.BinaryTapViewPanel;
import instrument.tap.stream.ComplexSampleTap;
import instrument.tap.stream.ComplexSampleTapViewPanel;
import instrument.tap.stream.ComplexTap;
import instrument.tap.stream.ComplexTapViewPanel;
import instrument.tap.stream.DibitTap;
@@ -51,18 +53,18 @@ import javax.swing.JPopupMenu;
import javax.swing.JSeparator;
import message.Message;
import module.decode.Decoder;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sample.Listener;
import source.Source.SampleType;
import sample.SampleType;
import source.wave.ComplexWaveSource;
import source.wave.FloatWaveSource;
import source.wave.WaveSource;
import source.wave.WaveSource.PositionListener;
import decode.Decoder;
public class DecoderViewFrame extends JInternalFrame
implements PositionListener, Listener<Message>
@@ -85,12 +87,12 @@ public class DecoderViewFrame extends JInternalFrame
if( source.getSampleType() == SampleType.COMPLEX )
{
ComplexWaveSource cws = (ComplexWaveSource)mWaveSource;
cws.addListener( mDecoder.getComplexReceiver() );
// cws.addListener( mDecoder.getComplexReceiver() );
}
else if( source.getSampleType() == SampleType.REAL )
{
FloatWaveSource fws = (FloatWaveSource)mWaveSource;
fws.setListener( mDecoder.getRealReceiver() );
// fws.setListener( mDecoder.getRealReceiver() );
}
mDecoder.addMessageListener( this );
@@ -102,7 +104,7 @@ public class DecoderViewFrame extends JInternalFrame
{
setLayout( new MigLayout( "insets 0 0 0 0 ", "[grow,fill]", "[grow,fill]" ) );
setTitle( "Decoder [" + mDecoder.getType().getDisplayString() + "]" );
setTitle( "Decoder [" + mDecoder.getDecoderType().getDisplayString() + "]" );
setPreferredSize( new Dimension( 450, 250 ) );
setSize( 450, 250 );
@@ -177,6 +179,9 @@ public class DecoderViewFrame extends JInternalFrame
case STREAM_COMPLEX:
panel = new ComplexTapViewPanel( (ComplexTap)tap );
break;
case STREAM_COMPLEX_SAMPLE:
panel = new ComplexSampleTapViewPanel( (ComplexSampleTap)tap );
break;
case STREAM_DIBIT:
panel = new DibitTapViewPanel( (DibitTap)tap );
break;