mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-12 08:37:25 -05:00
Updates complex decimation filters to use either scalar or vector optimal implementation. (#1148)
Updates HackRF native byte buffers with automatic DC removal. Creates new half-band channel source to replace the cic-based channel source in the heterodyne channelizer. Resolves issue in RTL native buffer processing. Creates a CACHED thread pool and reduces the number of threads for the SCHEDULED thread pool to 2. Changes each of the channel source implementations to use a dedicated thread (Dispatcher class) instead of the scheduled thread pool, to reduce the amount of buffered/retained samples objects in memory. Lots of other small changes and tweaks. Removes last of Reusable buffer code. Updates DFTProcessor to use a single thread scheduled executor. Updates Polyphase channelizer to use threads instead of an executor. Removes a number of unused classes. Commenting out window calibration. Scalar is faster in both implementations. Adds vector and scalar implementations for windows. Repackages window and window type classes. WIP adds vector implementations for Airspy non-interleaved buffer iterator and calibration plugins for both interleaved and non-interleaved buffer iterators. WIP adds vector implementations for Airspy interleaved buffer iterator. Work on developing scalar and vector implementations of airspy sample conversion and airspy native buffer processing. Introduces new INativeBuffer framework where tuner raw samples are retained in their native (compressed) format until when they're needed and they are converted on-demand into smaller complex sample buffers to aid garbage collection. Removes all usage of ReusableComplexBuffers and ReusableChannelREsultsBuffers. Updates polyphase channelizer to be more efficient in output channel processing. Updates ViterbiDecoder to change Map usage to array for memory efficiency. Updates channel processors to used scalar implementation for gain and mixer, until the polyphase channel results can be fixed to be a multiple of the SIMD lane width. Resolves final changes for the conversion from interleaved sample arrays to complexsamples buffers for distributing baseband samples to channels and processing chains. Updates tuner channel sources and all decoders to receive new complex samples buffers, removing the previous reusable complex buffers as the default baseband samples buffer object. Still to resolve is the ComplexMixer implementations. Needs validation and a calibration implementation with an update to the complex mixer factory. Updates the DMR decoder to use optimal (scalar vs vector) implementations of filter and AGC controls. Updates the AM demodulator for separated I&Q float sample processing. Code review and testing changes. updates build script for runtime configuration. Integrates calibration manager with main sdrtrunk application. Updates NBFMDecoder to use new optimized FIR and Decimation filter options. Updates real half-band decimation filters to select the optimal (scalar vs vector) implementation. Adds calibration manager plugins. Adds calibration manager and plugins to determine the optimal (scalar vs vector) implementation type to use for various classes of dsp components. Adds vector squelching FM demodulator and cleans up the IIR filter and power squelch to use all floats. Adds vector implementation of FM demodulator. This introduces a new interface that accepts i/q samples as two separate float arrays, versus an interleaved array, which enables more efficient processing. This new complex sample interface will be used across the codebase eventually. Adds ComplexOscillator and a SIMD version VectorComplexOscillator. Deprecates the LowPhaseNoiseOscillator because the ComplexOscillator is about 35% faster. The vectorized version is about 43% faster when SIMD lane width is 8x. Adds new vector complex filters and new real oscillators. Note: the RealOscillator using straight Java math sin() function is 3x slower than the existing legacy implementation. Will replace this with a complex oscillator that only uses the real part. Updates ComplexFIRFilter to be 50% more efficient. Adds 23 tap filter implementations. Will not add 63-tap implementations because they are slower than the default vector implementation. Adds 15-tap customized vector half band filters. Adds initial custom complex vector half-band decimation filters for 11-tap and 15-tap decimation filters.. Adds vector complex half band filter implementations. Note: performance of the generic 64-bit 2-lane filter is horrible and is not included. Optimizes complex half-band filter to be 27% more efficient. Implements vectorized real half-band filter implementations. Implements a new FIR filter class that processes sample buffers instead of single sample at a time. Refactored all of the calibratons to be time-duration based. Testing on windows i7 gen 3 CPU showed that it took 1000x longer for one of the calibrations to run, versus my AMD 5800x. Changed gradle jvm args so that the windows plaf export is always applied. Updates gradle build script to ensure incubator module is included and to cleanup javafx library management for building runtime images. Testing tweaks and changes. Adds logging limiter to dispatcher for buffer overflows Adds User Preferences editor for performing Vector/SIMD calibrations and new startup dialog prompting the user to perform calibrations. Updates calibration manager and all calibration implementations to add warm-up and test phases and to reduce the overall time it takes to calibrate a system. Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
@@ -0,0 +1,249 @@
|
||||
/*
|
||||
* *****************************************************************************
|
||||
* Copyright (C) 2014-2022 Dennis Sheirer
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
* ****************************************************************************
|
||||
*/
|
||||
package io.github.dsheirer.buffer;
|
||||
|
||||
import io.github.dsheirer.sample.Broadcaster;
|
||||
import io.github.dsheirer.sample.Listener;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.concurrent.LinkedTransferQueue;
|
||||
|
||||
/**
|
||||
* Delay buffer/queue with support for pre-loading new listeners (ie channels)
|
||||
* with delayed sample buffers and broadcasting of incoming sample buffers to a list of listeners.
|
||||
*
|
||||
* This class is designed to compensate/account for any delays in processing of a control channel and subsequent
|
||||
* channel grants so that when a new channel is allocated, that channel can be pre-loaded with time delayed sample
|
||||
* buffers that start as close as possible to the channel grant timestamp, in order to avoid cutting off the
|
||||
* beginning of a channel grant transmission.
|
||||
*
|
||||
* New channel listeners are enqueued with a request timestamp and as new buffers arrive, the new channel listeners
|
||||
* are preloaded with delayed buffers from the queue and then added to an internal broadcaster so that they
|
||||
* receive all subsequent buffers as normal.
|
||||
*
|
||||
* This class is designed to be controlled by the sample producer thread for adding new listeners and pre-loading
|
||||
* delayed buffers. Any listeners that are added to this class are expected to implement a non-blocking receive method
|
||||
* so as not to delay the stream of sample buffers. Channel listeners are expected to implement buffer queue processing
|
||||
* on another thread.
|
||||
*/
|
||||
public class NativeSampleDelayBuffer implements Listener<INativeBuffer>
|
||||
{
|
||||
private final static Logger mLog = LoggerFactory.getLogger(NativeSampleDelayBuffer.class);
|
||||
|
||||
private Broadcaster<INativeBuffer> mBroadcaster = new Broadcaster<>();
|
||||
private LinkedTransferQueue<ActionRequest> mActionQueue = new LinkedTransferQueue<>();
|
||||
private INativeBuffer[] mDelayBuffer;
|
||||
private int mDelayBufferPointer = 0;
|
||||
private long mBufferDuration;
|
||||
|
||||
/**
|
||||
* Creates a new delay buffer with the specified delay length and the buffer sample rate.
|
||||
*
|
||||
* @param size of the delay queue
|
||||
* @param bufferDuration in milliseconds for each complex buffer processed by this instance
|
||||
*/
|
||||
public NativeSampleDelayBuffer(int size, long bufferDuration)
|
||||
{
|
||||
mDelayBuffer = new INativeBuffer[size];
|
||||
mBufferDuration = bufferDuration;
|
||||
}
|
||||
|
||||
/**
|
||||
* Prepares this instance for disposal by releasing all stored sample buffers.
|
||||
*/
|
||||
public void dispose()
|
||||
{
|
||||
clearBuffer();
|
||||
mBroadcaster.clear();
|
||||
}
|
||||
|
||||
public void clear()
|
||||
{
|
||||
//Submit a clear buffer request to be processed upon the next buffer that arrives
|
||||
mActionQueue.offer(new ActionRequest());
|
||||
}
|
||||
|
||||
/**
|
||||
* Clears any delayed/enqueued sample buffers.
|
||||
*/
|
||||
private void clearBuffer()
|
||||
{
|
||||
for(int x = 0; x < mDelayBuffer.length; x++)
|
||||
{
|
||||
mDelayBuffer[x] = null;
|
||||
}
|
||||
|
||||
mDelayBufferPointer = 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void receive(INativeBuffer samples)
|
||||
{
|
||||
ActionRequest actionRequest = mActionQueue.poll();
|
||||
|
||||
while(actionRequest != null)
|
||||
{
|
||||
switch(actionRequest.getAction())
|
||||
{
|
||||
case ADD_LISTENER:
|
||||
processNewListener(actionRequest);
|
||||
break;
|
||||
case REMOVE_LISTENER:
|
||||
mBroadcaster.removeListener(actionRequest.getListener());
|
||||
break;
|
||||
case CLEAR_BUFFER:
|
||||
clearBuffer();
|
||||
break;
|
||||
}
|
||||
|
||||
actionRequest = mActionQueue.poll();
|
||||
}
|
||||
|
||||
mBroadcaster.receive(samples);
|
||||
|
||||
//Store the new buffer in the delay queue and increment the pointer
|
||||
mDelayBuffer[mDelayBufferPointer++] = samples;
|
||||
|
||||
//Wrap the delay buffer pointer as needed
|
||||
mDelayBufferPointer %= mDelayBuffer.length;
|
||||
}
|
||||
|
||||
/**
|
||||
* Indicates if any listeners are registered with this delay buffer
|
||||
*/
|
||||
public boolean hasListeners()
|
||||
{
|
||||
return mBroadcaster.hasListeners();
|
||||
}
|
||||
|
||||
/**
|
||||
* Processes any newly added listeners by checking all buffers in the delay queue and pre-loading the
|
||||
* listeners with any buffers that occur on or after the listener's requested start timestamp.
|
||||
*/
|
||||
private void processNewListener(ActionRequest listenerToAdd)
|
||||
{
|
||||
INativeBuffer toEvaluate;
|
||||
|
||||
int pointer = mDelayBufferPointer;
|
||||
|
||||
for(int x = 0; x < mDelayBuffer.length; x++)
|
||||
{
|
||||
toEvaluate = mDelayBuffer[pointer];
|
||||
|
||||
if(toEvaluate != null &&
|
||||
((toEvaluate.getTimestamp() + mBufferDuration) >= listenerToAdd.getTimestamp()))
|
||||
{
|
||||
listenerToAdd.getListener().receive(toEvaluate);
|
||||
}
|
||||
|
||||
pointer++;
|
||||
|
||||
if(pointer >= mDelayBuffer.length)
|
||||
{
|
||||
pointer = 0;
|
||||
}
|
||||
}
|
||||
|
||||
mBroadcaster.addListener(listenerToAdd.getListener());
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds the listener to receive a copy of each buffer. The listener will be preloaded with delayed buffers
|
||||
* that are at or after the specified timestamp.
|
||||
*
|
||||
* @param listener to add
|
||||
* @param timestamp of the oldest sample buffers to preload to the listener
|
||||
*/
|
||||
public void addListener(Listener<INativeBuffer> listener, long timestamp)
|
||||
{
|
||||
mActionQueue.add(new ActionRequest(listener, timestamp));
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes the listener from receiving sample buffers
|
||||
*/
|
||||
public void removeListener(Listener<INativeBuffer> listener)
|
||||
{
|
||||
mActionQueue.add(new ActionRequest(listener));
|
||||
}
|
||||
|
||||
private enum Action{ADD_LISTENER, REMOVE_LISTENER, CLEAR_BUFFER};
|
||||
|
||||
/**
|
||||
* Actions that must be completed on the incoming sample stream thread.
|
||||
*/
|
||||
public class ActionRequest<T extends INativeBuffer>
|
||||
{
|
||||
private Action mAction;
|
||||
private Listener<T> mListener;
|
||||
private long mTimestamp;
|
||||
|
||||
/**
|
||||
* Creates an add listener request
|
||||
* @param listener to add
|
||||
* @param timestamp for the preloading buffers to the listener from the delay queue
|
||||
*/
|
||||
public ActionRequest(Listener<T> listener, long timestamp)
|
||||
{
|
||||
mAction = Action.ADD_LISTENER;
|
||||
mListener = listener;
|
||||
mTimestamp = timestamp;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a remove listener request
|
||||
* @param listener
|
||||
*/
|
||||
public ActionRequest(Listener<T> listener)
|
||||
{
|
||||
mAction = Action.REMOVE_LISTENER;
|
||||
mListener = listener;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a clearBuffer buffer request
|
||||
*/
|
||||
public ActionRequest()
|
||||
{
|
||||
mAction = Action.CLEAR_BUFFER;
|
||||
}
|
||||
|
||||
public Action getAction()
|
||||
{
|
||||
return mAction;
|
||||
}
|
||||
|
||||
/**
|
||||
* Listener to be added/removed
|
||||
*/
|
||||
public Listener<T> getListener()
|
||||
{
|
||||
return mListener;
|
||||
}
|
||||
|
||||
/**
|
||||
* Requested timestamp for buffers to be preloaded.
|
||||
*/
|
||||
public long getTimestamp()
|
||||
{
|
||||
return mTimestamp;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user