GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 16:47:31 -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

36
src/source/tuner/Tuner.java
View File

@@ -23,6 +23,7 @@ import java.util.concurrent.RejectedExecutionException;
import javax.swing.JPanel;
import sample.Listener;
import sample.complex.ComplexBuffer;
import source.SourceException;
import source.tuner.FrequencyChangeEvent.Attribute;
import controller.ResourceManager;
@@ -37,8 +38,12 @@ public abstract class Tuner implements FrequencyChangeBroadcaster,
{
private String mName;
protected CopyOnWriteArrayList<Listener<Float[]>>
mSampleListeners = new CopyOnWriteArrayList<Listener<Float[]>>();
/**
* Sample Listeners - these will typically be the DFT processor for spectral
* display, or it will be one or more tuner channel sources
*/
protected CopyOnWriteArrayList<Listener<ComplexBuffer>>
mSampleListeners = new CopyOnWriteArrayList<Listener<ComplexBuffer>>();
protected CopyOnWriteArrayList<FrequencyChangeListener>
mFrequencyChangeListeners = new CopyOnWriteArrayList<FrequencyChangeListener>();
@@ -53,7 +58,11 @@ public abstract class Tuner implements FrequencyChangeBroadcaster,
return mName;
}
public abstract void dispose();
public void dispose()
{
mSampleListeners.clear();
mFrequencyChangeListeners.clear();
}
public void setName( String name )
{
@@ -141,7 +150,7 @@ public abstract class Tuner implements FrequencyChangeBroadcaster,
/**
* Registers the listener to receive complex float sample arrays
*/
public void addListener( Listener<Float[]> listener )
public void addListener( Listener<ComplexBuffer> listener )
{
mSampleListeners.add( listener );
}
@@ -149,7 +158,7 @@ public abstract class Tuner implements FrequencyChangeBroadcaster,
/**
* Removes the registered listener
*/
public void removeListener( Listener<Float[]> listener )
public void removeListener( Listener<ComplexBuffer> listener )
{
mSampleListeners.remove( listener );
}
@@ -157,11 +166,11 @@ public abstract class Tuner implements FrequencyChangeBroadcaster,
/**
* Broadcasts the samples to all registered listeners
*/
public void broadcast( Float[] samples )
public void broadcast( ComplexBuffer sampleBuffer )
{
for( Listener<Float[]> listener: mSampleListeners )
for( Listener<ComplexBuffer> listener: mSampleListeners )
{
listener.receive( samples );
listener.receive( sampleBuffer );
}
}
@@ -228,15 +237,4 @@ public abstract class Tuner implements FrequencyChangeBroadcaster,
{
broadcastFrequencyChangeEvent( event );
}
// /**
// * Broadcasts a frequency change event to all registered listeners
// */
// public void broadcastBandwidthChange( int bandwidth )
// {
// broadcastFrequencyChangeEvent(
// new FrequencyChangeEvent( Attribute.BANDWIDTH, bandwidth ) );
// }
//
}