#1670 Resolves missing audio segments for some DMR Cap+ call events.

DSheirer · Oct 15, 2023 · 0184904 · 0184904
1 parent bad5a1f
commit 0184904
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 22 deletions.
diff --git a/src/main/java/io/github/dsheirer/module/decode/dmr/audio/DMRAudioModule.java b/src/main/java/io/github/dsheirer/module/decode/dmr/audio/DMRAudioModule.java
@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2023 Dennis Sheirer
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -111,11 +111,6 @@ public void receive(IMessage message)
             {
                 mEncryptedCallStateEstablished = true;
                 mEncryptedCall = false;
-                List<byte[]> frames = vm.getAMBEFrames();
-                for(byte[] frame: frames)
-                {
-                    processAudio(frame, message.getTimestamp());
-                }
             }
             //Both Motorola and Hytera signal their Basic Privacy (BP) scrambling in some of the Voice B-F frames
             //in the EMB field.
@@ -126,20 +121,6 @@ else if(!mEncryptedCallStateEstablished && message instanceof VoiceEMBMessage vo
                     mEncryptedCallStateEstablished = true;
                     mEncryptedCall = voiceMessage.getEMB().isEncrypted();
                 }
-
-                List<byte[]> frames = voiceMessage.getAMBEFrames();
-                for(byte[] frame: frames)
-                {
-                    processAudio(frame, message.getTimestamp());
-                }
-            }
-            else if(message instanceof VoiceMessage voiceMessage)
-            {
-                List<byte[]> frames = voiceMessage.getAMBEFrames();
-                for(byte[] frame: frames)
-                {
-                    processAudio(frame, message.getTimestamp());
-                }
             }
             else if(!mEncryptedCallStateEstablished && message instanceof VoiceHeader voiceHeader)
             {
@@ -163,6 +144,17 @@ else if(!mEncryptedCallStateEstablished && message instanceof AbstractVoiceChann
                 mEncryptedCallStateEstablished = true;
                 mEncryptedCall = serviceOptions.isEncrypted();
             }
+
+            //Queue or process audio frames.  Note: audio frames are held until encrypted state is fully established
+            //before any audio is generated for the audio segment.
+            if(message instanceof VoiceMessage voiceMessage)
+            {
+                List<byte[]> frames = voiceMessage.getAMBEFrames();
+                for(byte[] frame: frames)
+                {
+                    processAudio(frame, message.getTimestamp());
+                }
+            }
             else if(message instanceof Terminator)
             {
                 reset();

diff --git a/...sheirer/module/decode/dmr/message/data/lc/full/motorola/CapacityPlusVoiceChannelUser.java b/...sheirer/module/decode/dmr/message/data/lc/full/motorola/CapacityPlusVoiceChannelUser.java
@@ -21,13 +21,13 @@
 
 import io.github.dsheirer.bits.CorrectedBinaryMessage;
 import io.github.dsheirer.module.decode.dmr.message.IServiceOptionsProvider;
-import io.github.dsheirer.module.decode.dmr.message.data.lc.full.FullLCMessage;
+import io.github.dsheirer.module.decode.dmr.message.data.lc.full.AbstractVoiceChannelUser;
 import io.github.dsheirer.module.decode.dmr.message.type.CapacityPlusServiceOptions;
 
 /**
  * Any Capacity Plus Voice Channel User link control message that contains vendor-specific service options.
  */
-public abstract class CapacityPlusVoiceChannelUser extends FullLCMessage implements IServiceOptionsProvider
+public abstract class CapacityPlusVoiceChannelUser extends AbstractVoiceChannelUser implements IServiceOptionsProvider
 {
     private static final int[] SERVICE_OPTIONS = new int[]{16, 17, 18, 19, 20, 21, 22, 23};
     //Reed Solomon FEC: 72-95