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

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

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2024-05-04 06:58:45 -04:00
committed by GitHub
parent cbe451a793
commit 2f0419f796
7 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/harris/isp/UnknownHarrisISPMessage.java
View File

@@ -1,18 +1,21 @@
/******************************************************************************* /*
* 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 * This program is free software: you can redistribute it and/or modify
* License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any * it under the terms of the GNU General Public License as published by
* later version. * 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 * This program is distributed in the hope that it will be useful,
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. * 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. * You should have received a copy of the GNU General Public License
* If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
* * ****************************************************************************
******************************************************************************/ */
package io.github.dsheirer.module.decode.p25.phase1.message.tsbk.harris.isp; package io.github.dsheirer.module.decode.p25.phase1.message.tsbk.harris.isp;
@@ -20,7 +23,6 @@ import io.github.dsheirer.bits.CorrectedBinaryMessage;
import io.github.dsheirer.identifier.Identifier; import io.github.dsheirer.identifier.Identifier;
import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID; import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID;
import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.OSPMessage; import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.OSPMessage;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@@ -41,7 +43,7 @@ public class UnknownHarrisISPMessage extends OSPMessage
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append(getMessageStub()); sb.append(getMessageStub());
sb.append(" HARRIS **UNRECOGNIZED ISP OPCODE**"); sb.append(" HARRIS **UNRECOGNIZED ISP OPCODE: ").append(getOpcodeNumber());
sb.append(" MSG:").append(getMessage().toHexString()); sb.append(" MSG:").append(getMessage().toHexString());
return sb.toString(); return sb.toString();
} }

30
src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/harris/osp/UnknownHarrisOSPMessage.java
View File

@@ -1,18 +1,21 @@
/******************************************************************************* /*
* 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 * This program is free software: you can redistribute it and/or modify
* License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any * it under the terms of the GNU General Public License as published by
* later version. * 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 * This program is distributed in the hope that it will be useful,
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. * 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. * You should have received a copy of the GNU General Public License
* If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
* * ****************************************************************************
******************************************************************************/ */
package io.github.dsheirer.module.decode.p25.phase1.message.tsbk.harris.osp; package io.github.dsheirer.module.decode.p25.phase1.message.tsbk.harris.osp;
@@ -20,7 +23,6 @@ import io.github.dsheirer.bits.CorrectedBinaryMessage;
import io.github.dsheirer.identifier.Identifier; import io.github.dsheirer.identifier.Identifier;
import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID; import io.github.dsheirer.module.decode.p25.phase1.P25P1DataUnitID;
import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.OSPMessage; import io.github.dsheirer.module.decode.p25.phase1.message.tsbk.OSPMessage;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@@ -41,7 +43,7 @@ public class UnknownHarrisOSPMessage extends OSPMessage
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append(getMessageStub()); sb.append(getMessageStub());
sb.append(" HARRIS **UNRECOGNIZED OSP OPCODE**"); sb.append(" HARRIS **UNRECOGNIZED OSP OPCODE:").append(getOpcodeNumber());
sb.append(" MSG:").append(getMessage().toHexString()); sb.append(" MSG:").append(getMessage().toHexString());
return sb.toString(); return sb.toString();
} }

2
src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/motorola/isp/UnknownMotorolaISPMessage.java
View File

@@ -43,7 +43,7 @@ public class UnknownMotorolaISPMessage extends VendorOSPMessage
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append(getMessageStub()); sb.append(getMessageStub());
sb.append(" MOTOROLA **UNRECOGNIZED ISP OPCODE**"); sb.append(" MOTOROLA **UNRECOGNIZED ISP OPCODE: ").append(getOpcodeNumber());
sb.append(" MSG:").append(getMessage().toHexString()); sb.append(" MSG:").append(getMessage().toHexString());
return sb.toString(); return sb.toString();
} }

10
src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/motorola/osp/UnknownMotorolaOSPMessage.java
View File

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

10
src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/isp/UnknownISPMessage.java
View File

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

10
src/main/java/io/github/dsheirer/module/decode/p25/phase1/message/tsbk/standard/osp/UnknownOSPMessage.java
View File

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

5
src/main/java/io/github/dsheirer/module/decode/p25/phase2/P25P2DecoderState.java
View File

@@ -1458,7 +1458,10 @@ public class P25P2DecoderState extends TimeslotDecoderState implements Identifie
* based solely on the null info in the traffic channel. Ultimately, the existing call event will either be * 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. * 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);
}
} }
/** /**