Updated spectral display to used dBm scale and removed baseline/amplification items.

Updated sample handling code to use -1.0 to 1.0 float values throughout, to support P25 decoder and symbol filter.
This commit is contained in:
dennis.sheirer
2014-11-01 17:39:06 +00:00
parent 86f374bb88
commit ae0568ff3b
34 changed files with 821 additions and 412 deletions

View File

@@ -40,11 +40,7 @@ public class FilteringNBFMDemodulator implements Listener<ComplexSample>
mAudioFilter = new FloatFIRFilter( audioFilter, audioGain );
/**
* Add the FM polar discriminator with a gain of 32768, to match
* the fact that we're producing demodulated float values
*/
mDiscriminator = new FMDiscriminator( 32768 );
mDiscriminator = new FMDiscriminator( 1 );
mIQFilter.setListener( mDiscriminator );

View File

@@ -37,7 +37,7 @@ public class NBFMDemodulator implements Listener<ComplexSample>
*/
public NBFMDemodulator()
{
this( FilterFactory.getLowPass( 48000, 4000, 73, WindowType.HAMMING ),
this( FilterFactory.getLowPass( 48000, 6250, 73, WindowType.HAMMING ),
1.0002, true );
}
@@ -45,11 +45,7 @@ public class NBFMDemodulator implements Listener<ComplexSample>
{
mIQFilter = new ComplexFIRFilter( iqFilter, iqGain );
/**
* Add the FM polar discriminator with a gain of 32768, to match
* the fact that we're producing demodulated float values
*/
mDiscriminator = new FMDiscriminator( 32768 );
mDiscriminator = new FMDiscriminator( 1 );
mIQFilter.setListener( mDiscriminator );