Merge branch 'master' of https://github.com/DSheirer/sdrtrunk.git

src/module/decode/DecoderFactory.java

@@ -83,6 +83,7 @@ import module.decode.state.TrafficChannelManager;
 import module.decode.tait.Tait1200Decoder;
 import module.decode.tait.Tait1200DecoderPanel;
 import module.decode.tait.Tait1200DecoderState;
+import module.demodulate.am.AMDemodulatorModule;
 import module.demodulate.fm.FMDemodulatorModule;
 
 import org.slf4j.Logger;
@@ -192,8 +193,10 @@ public class DecoderFactory
 		switch( decodeConfig.getDecoderType() )
 		{
 		    case AM:
+		    	modules.add( new AMDemodulatorModule() );
 		    	modules.add( new AMDecoder( decodeConfig ) );
 		    	modules.add( new AlwaysUnsquelchedDecoderState( DecoderType.AM, channelName ) );
+				modules.add( new AudioModule( recordAudio, REMOVE_DC ) );
 		        break;
 			case NBFM:
 				modules.add( new AudioModule( recordAudio, NO_REMOVE_DC ) );

src/module/decode/am/AMDecoder.java

@@ -27,8 +27,6 @@ public class AMDecoder extends PrimaryDecoder
 	public AMDecoder( DecodeConfiguration config )
 	{
 		super( config );
-		
-		//TODO: wire in the am decoder pieces
 	}
 
 	@Override

src/module/decode/am/AMDecoderPanel.java

@@ -19,6 +19,7 @@ package module.decode.am;
 
 import javax.swing.JLabel;
 
+import net.miginfocom.swing.MigLayout;
 import module.decode.state.ChangedAttribute;
 import module.decode.state.DecoderPanel;
 import module.decode.state.DecoderState;
@@ -41,7 +42,12 @@ public class AMDecoderPanel extends DecoderPanel
 	
 	public void init()
 	{
+		super.init();
+		
+    	setLayout( new MigLayout( "insets 0 0 0 0", "[grow,fill]", "[]0[]0[]") );
+		
 		mProtocol.setFont( mFontDecoder );
+		mProtocol.setForeground( mColorLabelDecoder );
 
 		add( mProtocol, "wrap" );
 	}

src/module/decode/p25/C4FMSymbolFilter.java

@@ -260,9 +260,6 @@ public class C4FMSymbolFilter implements FrequencyCorrectionResetListener,
 //						.getErrorCorrection() );
 
 			mFrequencyAdjustmentRequested = 0;
-
-			/* reset internal frequency error tracker */
-			mCoarseFrequencyCorrection = 0;
 		}
 	}
 

src/module/decode/p25/P25DecoderPanel.java

@@ -149,9 +149,9 @@ public class P25DecoderPanel extends DecoderPanel
 						{
 							mFromAlias.setText( from.getName() );
 							
-							String icon = from.getIconName();
+							final String icon = from.getIconName();
 							
-							if( icon != null )
+							if( icon != null && mSettingsManager != null )
 							{
 								mFromAlias.setIcon( mSettingsManager.getImageIcon( 
 									icon, SettingsManager.DEFAULT_ICON_SIZE )  );
@@ -180,9 +180,9 @@ public class P25DecoderPanel extends DecoderPanel
 						{
 							mToAlias.setText( to.getName() );
 
-							String icon = to.getIconName();
+							final String icon = to.getIconName();
 							
-							if( icon != null )
+							if( icon != null && mSettingsManager != null )
 							{
 								mToAlias.setIcon( mSettingsManager.getImageIcon( 
 									icon, SettingsManager.DEFAULT_ICON_SIZE )  );

src/module/decode/p25/P25_C4FMDecoder.java

@@ -24,6 +24,7 @@ import instrument.tap.stream.FloatBufferTap;
 import instrument.tap.stream.FloatTap;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.slf4j.Logger;
@@ -74,8 +75,10 @@ public class P25_C4FMDecoder extends P25Decoder implements IRealBufferListener
 		super( aliasList );
 		
 		/* Filter demodulated sample buffers */
-		mC4FMPreFilter = new RealFIRFilter_RB_RB( FilterFactory.getLowPass( 
-				48000, 6750, 7500, 60, WindowType.HANNING, true ), 1.0f );
+		float[] filter = FilterFactory.getLowPass( 48000, 2500, 4000, 80, WindowType.HANNING, true );
+
+		mLog.debug( "Filter taps:" + filter.length + " co:" + Arrays.toString( filter ) );
+		mC4FMPreFilter = new RealFIRFilter_RB_RB( filter, 1.0f );
 
 		/* Issue tuned frequency correction commands, remotely controlled by the 
 		 * downstream symbol filter */

src/module/decode/p25/audio/P25AudioModule.java

@@ -6,8 +6,6 @@ import message.IMessageListener;
 import message.Message;
 import module.Module;
 import module.decode.p25.message.ldu.LDUMessage;
-import module.decode.p25.message.tdu.TDUMessage;
-import module.decode.p25.message.tdu.lc.TDULinkControlMessage;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,6 +21,8 @@ import audio.squelch.ISquelchStateListener;
 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<Message>, 
 	IAudioPacketProvider, IMessageListener, IChannelEventListener, 
@@ -43,6 +43,7 @@ public class P25AudioModule extends Module implements Listener<Message>,
 	private AudioMetadata mAudioMetadata;
 	private ChannelEventListener mChannelEventListener = new ChannelEventListener();
 	private SquelchStateListener mSquelchStateListener = new SquelchStateListener();
+	private NonClippingGain mGain = new NonClippingGain( 5.0f, 0.95f );
 
 	public P25AudioModule( boolean record )
 	{
@@ -89,9 +90,10 @@ public class P25AudioModule extends Module implements Listener<Message>,
 	}
 
 	/**
-	 * Primary inject point for p25 imbe audio frame messages.  Each LDU audio 
-	 * message contains 9 imbe voice frames.  If the audio is not encrypted,
-	 * we insert each audio frame asynchronously into the audio converter.
+	 * Primary processing method for p25 imbe audio frame messages.  Each LDU 
+	 * audio message contains 9 imbe voice frames.  Each frame is converted to
+	 * audio when the JMBE library is loaded, processed by auto-gain, and 
+	 * broadcast to the audio packet listener.
 	 */
 	public void receive( Message message )
 	{
@@ -101,15 +103,15 @@ public class P25AudioModule extends Module implements Listener<Message>,
 			{
 				LDUMessage ldu = (LDUMessage)message;
 				
-				/* If we detect a valid LDU message with the encryption flag
-				 * set to true, we toggle the encrypted audio state until we 
-				 * receive the first TDU or TDULC message, then reset it. */
+				/* Only process unencrypted audio frames */
 				if( !( ldu.isValid() && ldu.isEncrypted() ) )
 				{
-					for( byte[] frame: ((LDUMessage)message).getIMBEFrames() )
+					for( byte[] frame: ldu.getIMBEFrames() )
 					{
 						float[] audio = mAudioConverter.decode( frame );
 
+						audio = mGain.apply( audio );
+
 						mAudioPacketListener.receive( 
 								new AudioPacket( audio, mAudioMetadata.copyOf() ) );
 					}

src/module/demodulate/am/AMDemodulatorModule.java

@@ -58,7 +58,7 @@ public class AMDemodulatorModule extends Module
 	public AMDemodulatorModule()
 	{
 		mIQFilter = new ComplexFIRFilter_CB_CB( FilterFactory.getLowPass( 
-			SAMPLE_RATE, 6500, 73, WindowType.HAMMING ), 1.0f );
+			SAMPLE_RATE, 5000, 73, WindowType.HAMMING ), 1.0f );
 		
 		mDemodulator = new AMDemodulator_CB( 500.0f );
 		mIQFilter.setListener( mDemodulator );

src/module/demodulate/fm/FMDemodulatorModule.java

@@ -133,7 +133,10 @@ public class FMDemodulatorModule extends Module implements IComplexBufferListene
 		mDemodulator.dispose();
 		mDemodulator = null;
 		
-		mDCRemovalFilter.dispose();
+		if( mDCRemovalFilter != null )
+		{
+			mDCRemovalFilter.dispose();
+		}
 		mDCRemovalFilter = null;
 		
 		if( mAutomaticFrequencyControl != null )