diff --git a/src/module/decode/p25/audio/P25AudioModule.java b/src/module/decode/p25/audio/P25AudioModule.java index c9074928..4fa08148 100644 --- a/src/module/decode/p25/audio/P25AudioModule.java +++ b/src/module/decode/p25/audio/P25AudioModule.java @@ -22,6 +22,7 @@ import audio.squelch.SquelchState; import controller.channel.ChannelEvent; import controller.channel.IChannelEventListener; import dsp.filter.iir.DeemphasisFilter; +import dsp.gain.NonClippingGain; public class P25AudioModule extends Module implements Listener, IAudioPacketProvider, IMessageListener, IChannelEventListener, @@ -42,7 +43,7 @@ public class P25AudioModule extends Module implements Listener, private AudioMetadata mAudioMetadata; private ChannelEventListener mChannelEventListener = new ChannelEventListener(); private SquelchStateListener mSquelchStateListener = new SquelchStateListener(); - private DeemphasisFilter mDeemphasis = new DeemphasisFilter( 48000.0f, 300.0f, 0.6f ); + private NonClippingGain mGain = new NonClippingGain( 5.0f, 0.95f ); public P25AudioModule( boolean record ) { @@ -109,7 +110,7 @@ public class P25AudioModule extends Module implements Listener, { float[] audio = mAudioConverter.decode( frame ); - audio = mDeemphasis.filter( audio ); + audio = mGain.apply( audio ); mAudioPacketListener.receive( new AudioPacket( audio, mAudioMetadata.copyOf() ) ); diff --git a/src/source/tuner/airspy/AirspyTunerController.java b/src/source/tuner/airspy/AirspyTunerController.java index 16fb9489..16577a55 100644 --- a/src/source/tuner/airspy/AirspyTunerController.java +++ b/src/source/tuner/airspy/AirspyTunerController.java @@ -597,8 +597,6 @@ public class AirspyTunerController extends TunerController { int count = EndianUtils.readSwappedInteger( rawCount, 0 ); - mLog.info( "There are [" + count + "] sample rates available" ); - byte[] rawRates = readArray( Command.GET_SAMPLE_RATES, 0, count, ( count * 4 ) );