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

P25 P1 MBE ESS order (#2273)

Browse Source 
* Modified P25P1 MBE ESS order. ESS will now be populated after LDU2, not at the beginning of LDU2

* Added a version field and incremented it to '2' to signify a breaking change in the order of P25P1 ESS placement.
This commit is contained in:
crsawyer
2025-11-22 04:18:41 -06:00
committed by GitHub
parent 7c06075880
commit d09fad56db
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/io/github/dsheirer/audio/codec/mbe/MBECallSequence.java
View File

@@ -36,7 +36,7 @@ import java.util.List;
* radio identifiers.
*/
@JsonRootName("mbe_call")
@JsonPropertyOrder({"protocol", "call_type", "from", "to", "encrypted", "frames"})
@JsonPropertyOrder({"protocol", "version", "call_type", "from", "to", "encrypted", "system", "site", "frames"})
@JsonInclude(JsonInclude.Include.NON_NULL)
public class MBECallSequence
{
@@ -77,6 +77,15 @@ public class MBECallSequence
mProtocol = protocol;
}
/**
* Gets the version number for the mbe file structure.
* Should be incremented only on breaking structural changes, not minor additions.
*/
@JsonProperty("version")
public Integer getVersion()
{
return 2;
}
/**
* Indicates if this sequences contains any audio frames

8
src/main/java/io/github/dsheirer/module/decode/p25/audio/P25P1CallSequenceRecorder.java
View File

@@ -152,10 +152,6 @@ public class P25P1CallSequenceRecorder extends MBECallSequenceRecorder
{
process((LDU1Message)lduMessage);
}
else if(lduMessage instanceof LDU2Message)
{
process((LDU2Message)lduMessage);
}
List<byte[]> voiceFrames = lduMessage.getIMBEFrames();
@@ -170,6 +166,10 @@ public class P25P1CallSequenceRecorder extends MBECallSequenceRecorder
baseTimestamp += 20;
}
if(lduMessage instanceof LDU2Message)
{
process((LDU2Message)lduMessage);
}
}
private void process(LinkControlWord lcw)