mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-12 16:47:31 -05:00
Initial commit of redesigned internal processing and audio management.
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:
@@ -73,9 +73,6 @@ public class SDRTrunk
|
||||
|
||||
public SDRTrunk()
|
||||
{
|
||||
// LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory();
|
||||
// StatusPrinter.print( lc );
|
||||
|
||||
mLog.info( "" );
|
||||
mLog.info( "" );
|
||||
mLog.info( "*******************************************************************" );
|
||||
|
||||
@@ -20,11 +20,11 @@ import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import sample.Listener;
|
||||
import sample.complex.ComplexSample;
|
||||
import sample.complex.Complex;
|
||||
import buffer.CircularBuffer;
|
||||
|
||||
public class ConstellationViewer extends JPanel
|
||||
implements Listener<ComplexSample>
|
||||
implements Listener<Complex>
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@@ -36,9 +36,9 @@ public class ConstellationViewer extends JPanel
|
||||
private float mSamplesPerSymbol;
|
||||
private float mCounter = 0;
|
||||
private float mOffset = 0;
|
||||
private CircularBuffer<ComplexSample> mBuffer =
|
||||
new CircularBuffer<ComplexSample>( 5000 );
|
||||
private ComplexSample mPrevious = new ComplexSample( 1, 1 );
|
||||
private CircularBuffer<Complex> mBuffer =
|
||||
new CircularBuffer<Complex>( 5000 );
|
||||
private Complex mPrevious = new Complex( 1, 1 );
|
||||
|
||||
public ConstellationViewer( int sampleRate, int symbolRate )
|
||||
{
|
||||
@@ -76,11 +76,11 @@ public class ConstellationViewer extends JPanel
|
||||
}
|
||||
|
||||
@Override
|
||||
public void receive( ComplexSample sample )
|
||||
public void receive( Complex sample )
|
||||
{
|
||||
mBuffer.receive( sample );
|
||||
|
||||
ComplexSample angle = ComplexSample.multiply( sample, mPrevious.conjugate() );
|
||||
Complex angle = Complex.multiply( sample, mPrevious.conjugate() );
|
||||
|
||||
repaint();
|
||||
}
|
||||
@@ -109,7 +109,7 @@ public class ConstellationViewer extends JPanel
|
||||
|
||||
graphics.setColor( Color.BLUE );
|
||||
|
||||
List<ComplexSample> samples = mBuffer.getElements();
|
||||
List<Complex> samples = mBuffer.getElements();
|
||||
|
||||
double centerX = (double)getHeight() / 2.0d;
|
||||
double centerY = (double)getWidth() / 2.0d;
|
||||
@@ -118,7 +118,7 @@ public class ConstellationViewer extends JPanel
|
||||
|
||||
mCounter = 0;
|
||||
|
||||
for( ComplexSample sample: samples )
|
||||
for( Complex sample: samples )
|
||||
{
|
||||
if( mCounter > ( mOffset + mSamplesPerSymbol ) )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user