#1903 P25 Phase 2 audio - resolves 2-second chopped audio segments (#…

…1904) Co-authored-by: Dennis Sheirer <dsheirer@github.com>
DSheirer · May 4, 2024 · 2f0419f · 2f0419f
1 parent cbe451a
commit 2f0419f
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 48 deletions.
diff --git a/...ub/dsheirer/module/decode/p25/phase1/message/tsbk/harris/isp/UnknownHarrisISPMessage.java b/...ub/dsheirer/module/decode/p25/phase1/message/tsbk/harris/isp/UnknownHarrisISPMessage.java
@@ -1,26 +1,28 @@
-/*******************************************************************************
- * sdr-trunk
- * Copyright (C) 2014-2019 Dennis Sheirer
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2024 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  the Free Software Foundation, either version 3 of the License, or  (at your option) any
- * later version.
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License  along with this program.
- * If not, see <http://www.gnu.org/licenses/>
- *
- ******************************************************************************/
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
 
 package io.github.dsheirer.module.decode.p25.phase1.message.tsbk.harris.isp;
 
 import io.github.dsheirer.bits.CorrectedBinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.OSPMessage;
-
 import java.util.Collections;
 import java.util.List;
 
@@ -41,7 +43,7 @@ public String toString()
     {
         StringBuilder sb = new StringBuilder();
         sb.append(getMessageStub());
-        sb.append(" HARRIS **UNRECOGNIZED ISP OPCODE**");
+        sb.append(" HARRIS **UNRECOGNIZED ISP OPCODE: ").append(getOpcodeNumber());
         sb.append(" MSG:").append(getMessage().toHexString());
         return sb.toString();
     }

diff --git a/...ub/dsheirer/module/decode/p25/phase1/message/tsbk/harris/osp/UnknownHarrisOSPMessage.java b/...ub/dsheirer/module/decode/p25/phase1/message/tsbk/harris/osp/UnknownHarrisOSPMessage.java
@@ -1,26 +1,28 @@
-/*******************************************************************************
- * sdr-trunk
- * Copyright (C) 2014-2019 Dennis Sheirer
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2024 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  the Free Software Foundation, either version 3 of the License, or  (at your option) any
- * later version.
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License  along with this program.
- * If not, see <http://www.gnu.org/licenses/>
- *
- ******************************************************************************/
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
 
 package io.github.dsheirer.module.decode.p25.phase1.message.tsbk.harris.osp;
 
 import io.github.dsheirer.bits.CorrectedBinaryMessage;
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.OSPMessage;
-
 import java.util.Collections;
 import java.util.List;
 
@@ -41,7 +43,7 @@ public String toString()
     {
         StringBuilder sb = new StringBuilder();
         sb.append(getMessageStub());
-        sb.append(" HARRIS **UNRECOGNIZED OSP OPCODE**");
+        sb.append(" HARRIS **UNRECOGNIZED OSP OPCODE:").append(getOpcodeNumber());
         sb.append(" MSG:").append(getMessage().toHexString());
         return sb.toString();
     }

diff --git a/...sheirer/module/decode/p25/phase1/message/tsbk/motorola/isp/UnknownMotorolaISPMessage.java b/...sheirer/module/decode/p25/phase1/message/tsbk/motorola/isp/UnknownMotorolaISPMessage.java
@@ -43,7 +43,7 @@ public String toString()
     {
         StringBuilder sb = new StringBuilder();
         sb.append(getMessageStub());
-        sb.append(" MOTOROLA **UNRECOGNIZED ISP OPCODE**");
+        sb.append(" MOTOROLA **UNRECOGNIZED ISP OPCODE: ").append(getOpcodeNumber());
         sb.append(" MSG:").append(getMessage().toHexString());
         return sb.toString();
     }

diff --git a/...sheirer/module/decode/p25/phase1/message/tsbk/motorola/osp/UnknownMotorolaOSPMessage.java b/...sheirer/module/decode/p25/phase1/message/tsbk/motorola/osp/UnknownMotorolaOSPMessage.java
@@ -1,7 +1,6 @@
 /*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2019 Dennis Sheirer
+ * *****************************************************************************
+ * Copyright (C) 2014-2024 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
@@ -15,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * *****************************************************************************
+ * ****************************************************************************
  */
 
 package io.github.dsheirer.module.decode.p25.phase1.message.tsbk.motorola.osp;
@@ -24,7 +23,6 @@
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.OSPMessage;
-
 import java.util.Collections;
 import java.util.List;
 
@@ -45,7 +43,7 @@ public String toString()
     {
         StringBuilder sb = new StringBuilder();
         sb.append(getMessageStub());
-        sb.append(" MOTOROLA **UNRECOGNIZED OSP OPCODE**");
+        sb.append(" MOTOROLA **UNRECOGNIZED OSP OPCODE: ").append(getOpcodeNumber());
         sb.append(" MSG:").append(getMessage().toHexString());
         return sb.toString();
     }

diff --git a/...github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/isp/UnknownISPMessage.java b/...github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/isp/UnknownISPMessage.java
@@ -1,7 +1,6 @@
 /*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2019 Dennis Sheirer
+ * *****************************************************************************
+ * Copyright (C) 2014-2024 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
@@ -15,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * *****************************************************************************
+ * ****************************************************************************
  */
 
 package io.github.dsheirer.module.decode.p25.phase1.message.tsbk.standard.isp;
@@ -24,7 +23,6 @@
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.ISPMessage;
-
 import java.util.Collections;
 import java.util.List;
 
@@ -45,7 +43,7 @@ public String toString()
     {
         StringBuilder sb = new StringBuilder();
         sb.append(getMessageStub());
-        sb.append(" **UNRECOGNIZED ISP OPCODE**");
+        sb.append(" **UNRECOGNIZED ISP OPCODE: ").append(getOpcodeNumber());
         sb.append(" MSG:").append(getMessage().toHexString());
         return sb.toString();
     }

diff --git a/...github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/osp/UnknownOSPMessage.java b/...github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/osp/UnknownOSPMessage.java
@@ -1,7 +1,6 @@
 /*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2019 Dennis Sheirer
+ * *****************************************************************************
+ * Copyright (C) 2014-2024 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
@@ -15,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * *****************************************************************************
+ * ****************************************************************************
  */
 
 package io.github.dsheirer.module.decode.p25.phase1.message.tsbk.standard.osp;
@@ -24,7 +23,6 @@
 import io.github.dsheirer.identifier.Identifier;
 import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID;
 import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.OSPMessage;
-
 import java.util.Collections;
 import java.util.List;
 
@@ -45,7 +43,7 @@ public String toString()
     {
         StringBuilder sb = new StringBuilder();
         sb.append(getMessageStub());
-        sb.append(" **UNRECOGNIZED OSP OPCODE**");
+        sb.append(" **UNRECOGNIZED OSP OPCODE: ").append(getOpcodeNumber());
         sb.append(" MSG:").append(getMessage().toHexString());
         return sb.toString();
     }

diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/phase2/P25P2DecoderState.java b/src/main/java/io/github/dsheirer/module/decode/p25/phase2/P25P2DecoderState.java
@@ -1458,7 +1458,10 @@ private void processNullInformation(MacMessage message, MacStructure mac)
          * based solely on the null info in the traffic channel.  Ultimately, the existing call event will either be
          * updated by a subsequent call, or removed via the traffic channel teardown.
          */
-        continueState(State.ACTIVE);
+        if(message.getMacPduType() != MacPduType.MAC_4_ACTIVE) //Don't change the state when we're in a call
+        {
+            continueState(State.ACTIVE);
+        }
     }
 
     /**