GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-13 17:17:29 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Removed deemphasis experiment and replaced with a fixed, non-clipping

Browse Source 
gain module for P25 IMBE audio.
This commit is contained in:
denny
2015-12-12 07:11:30 -05:00
parent 98c70a1b12
commit 4caecaa476
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/module/decode/p25/audio/P25AudioModule.java
View File

@@ -22,6 +22,7 @@ import audio.squelch.SquelchState;
import controller.channel.ChannelEvent; import controller.channel.ChannelEvent;
import controller.channel.IChannelEventListener; import controller.channel.IChannelEventListener;
import dsp.filter.iir.DeemphasisFilter; import dsp.filter.iir.DeemphasisFilter;
import dsp.gain.NonClippingGain;
public class P25AudioModule extends Module implements Listener<Message>, public class P25AudioModule extends Module implements Listener<Message>,
IAudioPacketProvider, IMessageListener, IChannelEventListener, IAudioPacketProvider, IMessageListener, IChannelEventListener,
@@ -42,7 +43,7 @@ public class P25AudioModule extends Module implements Listener<Message>,
private AudioMetadata mAudioMetadata; private AudioMetadata mAudioMetadata;
private ChannelEventListener mChannelEventListener = new ChannelEventListener(); private ChannelEventListener mChannelEventListener = new ChannelEventListener();
private SquelchStateListener mSquelchStateListener = new SquelchStateListener(); 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 ) public P25AudioModule( boolean record )
{ {
@@ -109,7 +110,7 @@ public class P25AudioModule extends Module implements Listener<Message>,
{ {
float[] audio = mAudioConverter.decode( frame ); float[] audio = mAudioConverter.decode( frame );
audio = mDeemphasis.filter( audio ); audio = mGain.apply( audio );
mAudioPacketListener.receive( mAudioPacketListener.receive(
new AudioPacket( audio, mAudioMetadata.copyOf() ) ); new AudioPacket( audio, mAudioMetadata.copyOf() ) );

2
src/source/tuner/airspy/AirspyTunerController.java
View File

@@ -597,8 +597,6 @@ public class AirspyTunerController extends TunerController
{ {
int count = EndianUtils.readSwappedInteger( rawCount, 0 ); int count = EndianUtils.readSwappedInteger( rawCount, 0 );
mLog.info( "There are [" + count + "] sample rates available" );
byte[] rawRates = readArray( Command.GET_SAMPLE_RATES, 0, byte[] rawRates = readArray( Command.GET_SAMPLE_RATES, 0,
count, ( count * 4 ) ); count, ( count * 4 ) );