P25 Dibit, Block and PDU Payload Tweaks;

This commit is contained in:
lwvmobile
2023-02-20 12:35:44 -05:00
parent 0217202801
commit 38b962aacf
4 changed files with 126 additions and 27 deletions

View File

@@ -283,12 +283,11 @@ static int digitize (dsd_opts* opts, dsd_state* state, int symbol)
valid = 0;
//only run estimate_symbol when we aren't trunking, otherwise noise/gain levels on other rf channels may impact performance severely
//honestly can't say I've seen any improvement when using heuristics, but is detrimental to playing back multiple p25 samples
if (state->synctype == 1 && opts->p25_trunk == 0)
//re-enabling -- heuristics may also work with P2, but cna't see any benefit, need more P2 C4FM samples for testing
if (state->synctype == 1 && opts->p25_trunk == 1) //|| state->synctype == 36
{
// Use the P25 heuristics if available
//valid = estimate_symbol(state->rf_mod, &(state->inv_p25_heuristics), state->last_dibit, symbol, &dibit);
valid = estimate_symbol(state->rf_mod, &(state->inv_p25_heuristics), state->last_dibit, symbol, &dibit);
}
if (valid == 0)
@@ -348,12 +347,11 @@ static int digitize (dsd_opts* opts, dsd_state* state, int symbol)
valid = 0;
//only run estimate_symbol when we aren't trunking, otherwise noise/gain levels on other rf channels may impact performance severely
//honestly can't say I've seen any improvement when using heuristics, but is detrimental to playing back multiple p25 samples
if (state->synctype == 0 && opts->p25_trunk == 0)
////re-enabling, but only when trunking (should have uniform volume if not tampered with during setup)
if (state->synctype == 0 && opts->p25_trunk == 1) //|| state->synctype == 35
{
// Use the P25 heuristics if available
//valid = estimate_symbol(state->rf_mod, &(state->p25_heuristics), state->last_dibit, symbol, &dibit);
valid = estimate_symbol(state->rf_mod, &(state->p25_heuristics), state->last_dibit, symbol, &dibit);
}
if (valid == 0)