P25p1 -- Disable Heuristics (again)

This commit is contained in:
lwvmobile
2023-10-06 07:00:55 -04:00
parent cc5248e958
commit 9aee34a501
2 changed files with 4 additions and 4 deletions

View File

@@ -2086,7 +2086,7 @@ main (int argc, char **argv)
// opts.setmod_bw = 12000; // opts.setmod_bw = 12000;
opts.ssize = 36; //128 current default, fall back to old default on P1 only systems opts.ssize = 36; //128 current default, fall back to old default on P1 only systems
opts.msize = 15; //1024 current default, fall back to old default on P1 only systems opts.msize = 15; //1024 current default, fall back to old default on P1 only systems
opts.use_heuristics = 1; //enable for Phase 1 only // opts.use_heuristics = 1; //Causes issues with Voice Wide
sprintf (opts.output_name, "P25p1"); sprintf (opts.output_name, "P25p1");
fprintf (stderr,"Decoding only P25 Phase 1 frames.\n"); fprintf (stderr,"Decoding only P25 Phase 1 frames.\n");
} }
@@ -2224,7 +2224,7 @@ main (int argc, char **argv)
// opts.setmod_bw = 12000; //safe default on both DMR and P25 // opts.setmod_bw = 12000; //safe default on both DMR and P25
opts.pulse_digi_rate_out = 8000; opts.pulse_digi_rate_out = 8000;
opts.pulse_digi_out_channels = 2; opts.pulse_digi_out_channels = 2;
opts.use_heuristics = 1; //enable for Phase 1 on -ft switch (testing) // opts.use_heuristics = 1; //Causes issues with Voice Wide
sprintf (opts.output_name, "TDMA"); sprintf (opts.output_name, "TDMA");
fprintf (stderr,"Decoding P25 and DMR\n"); fprintf (stderr,"Decoding P25 and DMR\n");
} }

View File

@@ -1361,7 +1361,7 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
{ {
//TDMA -- was P25p1 only //TDMA -- was P25p1 only
// resetState (state); //use sparingly, may cause memory leak // resetState (state); //use sparingly, may cause memory leak
opts->use_heuristics = 1; // opts->use_heuristics = 1; //Causes issues with Voice Wide
if (opts->use_heuristics == 1) if (opts->use_heuristics == 1)
{ {
initialize_p25_heuristics(&state->p25_heuristics); initialize_p25_heuristics(&state->p25_heuristics);
@@ -1403,7 +1403,7 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
initialize_p25_heuristics(&state->p25_heuristics); initialize_p25_heuristics(&state->p25_heuristics);
initialize_p25_heuristics(&state->inv_p25_heuristics); initialize_p25_heuristics(&state->inv_p25_heuristics);
} }
opts->use_heuristics = 0; // opts->use_heuristics = 0;
opts->frame_dmr = 1; opts->frame_dmr = 1;
state->samplesPerSymbol = 10; state->samplesPerSymbol = 10;
state->symbolCenter = 4; state->symbolCenter = 4;