#6 DMR Decoder (#947)

* #6 DMR decoder feature - work in progress * #6 DMR Decoder. * #6 DMR Decoder. Code review updates. Co-authored-by: Zhenyu Mao <maozhenyu@foxmail.com> Co-authored-by: Denny <denny@denny-desktop>
DSheirer · Oct 12, 2020 · 7eec82d · 7eec82d
1 parent b061db1
commit 7eec82d
Show file tree

Hide file tree

Showing 436 changed files with 36,250 additions and 2,401 deletions.
diff --git a/.idea/dictionaries/denny.xml b/.idea/dictionaries/denny.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/build.gradle b/build.gradle
@@ -110,6 +110,7 @@ idea {
 }
 
 javafx {
+    version = "13.0.2"
     modules = ['javafx.base', 'javafx.controls', 'javafx.graphics', 'javafx.swing']
 }
 

diff --git a/src/main/java/io/github/dsheirer/alias/action/AliasActionManager.java b/src/main/java/io/github/dsheirer/alias/action/AliasActionManager.java
@@ -93,12 +93,6 @@ public void stop()
         //No actions neeeded
     }
 
-    @Override
-    public void dispose()
-    {
-        //No actions neeeded
-    }
-
     /**
      * IMessageListener interface ... delegates to this class implementation of Listener<Message>
      */

diff --git a/src/main/java/io/github/dsheirer/alias/id/radio/RadioFormat.java b/src/main/java/io/github/dsheirer/alias/id/radio/RadioFormat.java
@@ -36,6 +36,8 @@ public enum RadioFormat
 {
     APCO25("********", 0, 0xFFFFFF, "0 to 16,777,215",
         "<html>APCO25 valid range is 0 to 16,777,215"),
+    DMR("********", 0, 0xFFFFFF, "0 to 16,777,215",
+        "<html>DMR unit id valid range is 0 to 16,777,215"),
     PASSPORT("********", 0, 0x7FFFFF, "0 to 8,388,607",
         "<html>PASSPORT valid range is 0 to 8,388,607"),
     UNKNOWN("********", 1, 0xFFFFFF, "1 to 16,777,215",
@@ -112,6 +114,8 @@ public static RadioFormat get(Protocol protocol)
         {
             case APCO25:
                 return APCO25;
+            case DMR:
+                return DMR;
             case PASSPORT:
                 return PASSPORT;
             default:

diff --git a/src/main/java/io/github/dsheirer/alias/id/radio/RadioFormatter.java b/src/main/java/io/github/dsheirer/alias/id/radio/RadioFormatter.java
@@ -25,14 +25,14 @@
 import io.github.dsheirer.preference.identifier.IntegerFormat;
 import io.github.dsheirer.preference.identifier.talkgroup.APCO25TalkgroupFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.AbstractIntegerFormatter;
+import io.github.dsheirer.preference.identifier.talkgroup.DMRTalkgroupFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.UnknownTalkgroupFormatter;
 import io.github.dsheirer.protocol.Protocol;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.text.ParseException;
 import java.util.EnumMap;
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -46,6 +46,7 @@ public class RadioFormatter
     static
     {
         mFormatterMap.put(Protocol.APCO25, new APCO25TalkgroupFormatter());
+        mFormatterMap.put(Protocol.DMR, new DMRTalkgroupFormatter());
         mFormatterMap.put(Protocol.UNKNOWN, new UnknownTalkgroupFormatter());
     }
 

diff --git a/src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupFormat.java b/src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupFormat.java
@@ -34,8 +34,10 @@
  */
 public enum TalkgroupFormat
 {
-    APCO25("********", 0, 0xFFFFFF, "0 to 65,535",
+    APCO25("********", 0, 0xFFFF, "0 to 65,535",
         "<html>APCO25 talkgroup valid range is 0 to 65,535"),
+    DMR("********", 0, 0xFFFFFF, "0 to 16,777,215",
+        "<html>DMR talkgroup valid range is 0 to 16,777,215"),
     FLEETSYNC("###-####", 0, 0x7FFFFF, "001-0001 to 127-8192",
         "<html>Fleetsync valid ranges are 1-127(prefix)<br>and 1-8192(ident) (ie. 001-0001 to 127-8192)"),
     LTR("##-###", 0x101, 0x3FFF, "01-001 to 20-255",

diff --git a/src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupFormatter.java b/src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupFormatter.java
@@ -23,6 +23,7 @@
 import io.github.dsheirer.preference.identifier.IntegerFormat;
 import io.github.dsheirer.preference.identifier.talkgroup.APCO25TalkgroupFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.AbstractIntegerFormatter;
+import io.github.dsheirer.preference.identifier.talkgroup.DMRTalkgroupFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.FleetsyncTalkgroupFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.LTRTalkgroupFormatter;
 import io.github.dsheirer.preference.identifier.talkgroup.MDC1200TalkgroupFormatter;
@@ -35,7 +36,6 @@
 
 import java.text.ParseException;
 import java.util.EnumMap;
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -49,6 +49,7 @@ public class TalkgroupFormatter
     static
     {
         mFormatterMap.put(Protocol.APCO25, new APCO25TalkgroupFormatter());
+        mFormatterMap.put(Protocol.DMR, new DMRTalkgroupFormatter());
         mFormatterMap.put(Protocol.FLEETSYNC, new FleetsyncTalkgroupFormatter());
         LTRTalkgroupFormatter ltr = new LTRTalkgroupFormatter();
         mFormatterMap.put(Protocol.LTR, ltr);

diff --git a/src/main/java/io/github/dsheirer/audio/AbstractAudioModule.java b/src/main/java/io/github/dsheirer/audio/AbstractAudioModule.java
@@ -36,39 +36,48 @@
 public abstract class AbstractAudioModule extends Module implements IAudioSegmentProvider, IdentifierUpdateListener
 {
     private final static Logger mLog = LoggerFactory.getLogger(AbstractAudioModule.class);
-    private static final int DEFAULT_SEGMENT_AUDIO_SAMPLE_LENGTH = 60 * 8000; // 1 minute @ 8kHz
-
+    public static final long DEFAULT_SEGMENT_AUDIO_SAMPLE_LENGTH = 60 * 8000; // 1 minute @ 8kHz
+    public static final int DEFAULT_TIMESLOT = 0;
     private final int mMaxSegmentAudioSampleLength;
     private Listener<AudioSegment> mAudioSegmentListener;
-    protected MutableIdentifierCollection mIdentifierCollection = new MutableIdentifierCollection();
+    protected MutableIdentifierCollection mIdentifierCollection;
     private Broadcaster<IdentifierUpdateNotification> mIdentifierUpdateNotificationBroadcaster = new Broadcaster<>();
     private AliasList mAliasList;
     private AudioSegment mAudioSegment;
     private int mAudioSampleCount = 0;
     private boolean mRecordAudioOverride;
+    private int mTimeslot;
 
     /**
      * Constructs an abstract audio module
      *
      * @param aliasList for aliasing identifiers
      * @param maxSegmentAudioSampleLength in milliseconds
      */
-    public AbstractAudioModule(AliasList aliasList, long maxSegmentAudioSampleLength)
+    public AbstractAudioModule(AliasList aliasList, int timeslot, long maxSegmentAudioSampleLength)
     {
         mAliasList = aliasList;
         mMaxSegmentAudioSampleLength = (int)(maxSegmentAudioSampleLength * 8); //Convert milliseconds to samples
+        mTimeslot = timeslot;
+        mIdentifierCollection = new MutableIdentifierCollection(getTimeslot());
         mIdentifierUpdateNotificationBroadcaster.addListener(mIdentifierCollection);
     }
 
     /**
-     * Constructs an abstract audio module
+     * Constructs an abstract audio module with a default maximum audio segment length and a default timeslot 0.
      */
     public AbstractAudioModule(AliasList aliasList)
     {
-        this(aliasList, DEFAULT_SEGMENT_AUDIO_SAMPLE_LENGTH);
+        this(aliasList, DEFAULT_TIMESLOT, DEFAULT_SEGMENT_AUDIO_SAMPLE_LENGTH);
     }
 
-    protected abstract int getTimeslot();
+    /**
+     * Timeslot for this audio module
+     */
+    protected int getTimeslot()
+    {
+        return mTimeslot;
+    }
 
     /**
      * Closes the current audio segment

diff --git a/src/main/java/io/github/dsheirer/audio/AudioModule.java b/src/main/java/io/github/dsheirer/audio/AudioModule.java
@@ -83,9 +83,9 @@ public class AudioModule extends AbstractAudioModule implements ISquelchStateLis
      * @param aliasList for aliasing identifiers
      * @param maxAudioSegmentLength in milliseconds
      */
-    public AudioModule(AliasList aliasList, long maxAudioSegmentLength)
+    public AudioModule(AliasList aliasList, int timeslot, long maxAudioSegmentLength)
     {
-        super(aliasList, maxAudioSegmentLength);
+        super(aliasList, timeslot, maxAudioSegmentLength);
     }
 
     /**
@@ -102,13 +102,6 @@ protected int getTimeslot()
         return 0;
     }
 
-    @Override
-    public void dispose()
-    {
-        removeAudioSegmentListener();
-        mSquelchStateListener = null;
-    }
-
     @Override
     public void reset()
     {

diff --git a/src/main/java/io/github/dsheirer/audio/codec/mbe/AmbeAudioModule.java b/src/main/java/io/github/dsheirer/audio/codec/mbe/AmbeAudioModule.java
@@ -33,9 +33,9 @@ public abstract class AmbeAudioModule extends JmbeAudioModule
     private static final String AMBE_CODEC = "AMBE 3600 x 2450";
     private static boolean sLibraryStatusLogged = false;
 
-    public AmbeAudioModule(UserPreferences userPreferences, AliasList aliasList)
+    public AmbeAudioModule(UserPreferences userPreferences, AliasList aliasList, int timeslot)
     {
-        super(userPreferences, aliasList);
+        super(userPreferences, aliasList, timeslot);
 
         if(!sLibraryStatusLogged)
         {

diff --git a/src/main/java/io/github/dsheirer/audio/codec/mbe/ImbeAudioModule.java b/src/main/java/io/github/dsheirer/audio/codec/mbe/ImbeAudioModule.java
@@ -35,7 +35,7 @@ public abstract class ImbeAudioModule extends JmbeAudioModule
 
     public ImbeAudioModule(UserPreferences userPreferences, AliasList aliasList)
     {
-        super(userPreferences, aliasList);
+        super(userPreferences, aliasList, DEFAULT_TIMESLOT);
 
         if(!sLibraryStatusLogged)
         {

diff --git a/src/main/java/io/github/dsheirer/audio/codec/mbe/JmbeAudioModule.java b/src/main/java/io/github/dsheirer/audio/codec/mbe/JmbeAudioModule.java
@@ -54,14 +54,22 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
     private IAudioCodec mAudioCodec;
     private UserPreferences mUserPreferences;
 
-    public JmbeAudioModule(UserPreferences userPreferences, AliasList aliasList)
+    public JmbeAudioModule(UserPreferences userPreferences, AliasList aliasList, int timeslot)
     {
-        super(aliasList);
+        super(aliasList, timeslot, DEFAULT_SEGMENT_AUDIO_SAMPLE_LENGTH);
         mUserPreferences = userPreferences;
-        MyEventBus.getEventBus().register(this);
+        MyEventBus.getGlobalEventBus().register(this);
         loadConverter();
     }
 
+    @Override
+    public void dispose()
+    {
+        super.dispose();
+        MyEventBus.getGlobalEventBus().unregister(this);
+        mAudioCodec = null;
+    }
+
     protected IAudioCodec getAudioCodec()
     {
         return mAudioCodec;
@@ -236,10 +244,4 @@ protected void loadConverter()
             mAudioCodec = null;
         }
     }
-
-    @Override
-    public void dispose()
-    {
-        mAudioCodec = null;
-    }
 }
diff --git a/src/main/java/io/github/dsheirer/audio/codec/mbe/MBECallSequenceRecorder.java b/src/main/java/io/github/dsheirer/audio/codec/mbe/MBECallSequenceRecorder.java
@@ -77,11 +77,6 @@ public void start()
     {
     }
 
-    @Override
-    public void dispose()
-    {
-    }
-
     /**
      * Writes an MBE call sequence recording to the recording directory
      * @param sequence to write

diff --git a/src/main/java/io/github/dsheirer/audio/playback/AudioChannelPanel.java b/src/main/java/io/github/dsheirer/audio/playback/AudioChannelPanel.java
@@ -129,7 +129,7 @@ public void preferenceUpdated(PreferenceType preferenceType)
     public void dispose()
     {
         //Deregister from receiving preference update notifications
-        MyEventBus.getEventBus().unregister(this);
+        MyEventBus.getGlobalEventBus().unregister(this);
 
         if(mAudioOutput != null)
         {
@@ -141,7 +141,7 @@ public void dispose()
     private void init()
     {
         //Register to receive preference updates
-        MyEventBus.getEventBus().register(this);
+        MyEventBus.getGlobalEventBus().register(this);
 
         setLayout(new MigLayout("align center center, insets 0 0 0 0",
             "[][][align right]0[grow,fill]", ""));

diff --git a/src/main/java/io/github/dsheirer/audio/playback/AudioOutput.java b/src/main/java/io/github/dsheirer/audio/playback/AudioOutput.java
@@ -168,7 +168,7 @@ public AudioOutput(Mixer mixer, MixerChannel mixerChannel, AudioFormat audioForm
         updateToneInsertionAudioClips();
 
         //Register to receive directory preference update notifications so we can update the preference items
-        MyEventBus.getEventBus().register(this);
+        MyEventBus.getGlobalEventBus().register(this);
     }
 
     /**
@@ -514,6 +514,7 @@ else if(mCurrentBufferIndex > 0 &&
      */
     public void dispose()
     {
+        MyEventBus.getGlobalEventBus().unregister(this);
         mCanProcessAudio = false;
 
         if(mProcessorFuture != null)

diff --git a/src/main/java/io/github/dsheirer/audio/playback/AudioPanel.java b/src/main/java/io/github/dsheirer/audio/playback/AudioPanel.java
@@ -183,7 +183,7 @@ public void mouseClicked(MouseEvent event)
                     @Override
                     public void actionPerformed(ActionEvent e)
                     {
-                        MyEventBus.getEventBus().post(new ViewUserPreferenceEditorRequest(PreferenceEditorType.AUDIO_OUTPUT));
+                        MyEventBus.getGlobalEventBus().post(new ViewUserPreferenceEditorRequest(PreferenceEditorType.AUDIO_OUTPUT));
                     }
                 });
                 popup.add(outputMenu);

diff --git a/src/main/java/io/github/dsheirer/audio/playback/AudioPlaybackManager.java b/src/main/java/io/github/dsheirer/audio/playback/AudioPlaybackManager.java
@@ -73,7 +73,7 @@ public class AudioPlaybackManager implements Listener<AudioSegment>, IAudioContr
     public AudioPlaybackManager(UserPreferences userPreferences)
     {
         mUserPreferences = userPreferences;
-        MyEventBus.getEventBus().register(this);
+        MyEventBus.getGlobalEventBus().register(this);
 
         MixerChannelConfiguration configuration = mUserPreferences.getPlaybackPreference().getMixerChannelConfiguration();
 
@@ -254,6 +254,7 @@ else if(audioSegment.isLinked())
 
     public void dispose()
     {
+        MyEventBus.getGlobalEventBus().unregister(this);
         if(mProcessingTask != null)
         {
             mProcessingTask.cancel(true);

diff --git a/src/main/java/io/github/dsheirer/bits/BinaryMessage.java b/src/main/java/io/github/dsheirer/bits/BinaryMessage.java
@@ -834,6 +834,24 @@ public int getInt(int start, int end)
         return value;
     }
 
+    /**
+     * Returns the twos-complement value of the bits between start and end, inclusive
+     * @param start bit position
+     * @param end bit position
+     * @return twos complement value
+     */
+    public int getTwosComplement(int start, int end)
+    {
+        BinaryMessage sub = getSubMessage(start, end);
+        boolean negative = sub.get(start);
+        sub.flip(0, sub.size());
+
+        int value = sub.getInt(0, sub.size()) + 1;
+        value *= (negative ? -1 : 1);
+        return value;
+    }
+
+
     /**
      * Returns the long value represented by the bit range.  This method will
      * parse the bits in big endian or little endian format.  The start value

diff --git a/src/main/java/io/github/dsheirer/bits/SoftSyncDetector.java b/src/main/java/io/github/dsheirer/bits/SoftSyncDetector.java
@@ -33,6 +33,10 @@ public SoftSyncDetector(long pattern, int threshold, ISyncDetectListener listene
         mThreshold = threshold;
     }
 
+    public SoftSyncDetector(long pattern, int threshold) {
+        mPattern = pattern;
+        mThreshold = threshold;
+    }
     public void dispose()
     {
         mListener = null;

diff --git a/src/main/java/io/github/dsheirer/channel/details/ChannelDetailPanel.java b/src/main/java/io/github/dsheirer/channel/details/ChannelDetailPanel.java
@@ -25,9 +25,13 @@
 import io.github.dsheirer.sample.Listener;
 import net.miginfocom.swing.MigLayout;
 
-import javax.swing.*;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
 import javax.swing.text.DefaultCaret;
-import java.awt.*;
+import java.awt.EventQueue;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;