yafox
/
minimodem-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minimodem: fix carrier_nsamples 

All test cases (except 45.45 RTTY) get rate perfect!
This commit is contained in:
Kamal Mostafa 2012-08-18 13:43:45 -07:00
parent 97e8f4f715
commit bc30de33a4
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/minimodem.c
View File

@ -710,7 +710,6 @@ main( int argc, char*argv[] )
size_t carrier_nsamples = 0; size_t carrier_nsamples = 0;
unsigned int noconfidence = 0; unsigned int noconfidence = 0;
size_t noconfidence_nsamples = 0;
unsigned int advance = 0; unsigned int advance = 0;
// Fraction of nsamples_per_bit that we will "overscan"; range (0.0 .. 1.0) // Fraction of nsamples_per_bit that we will "overscan"; range (0.0 .. 1.0)
@ -736,9 +735,6 @@ main( int argc, char*argv[] )
debug_log("advance=%u\n", advance); debug_log("advance=%u\n", advance);
if ( carrier && nframes_decoded > 0 )
carrier_nsamples += advance;
/* Shift the samples in samplebuf by 'advance' samples */ /* Shift the samples in samplebuf by 'advance' samples */
assert( advance <= samplebuf_size ); assert( advance <= samplebuf_size );
if ( advance == samplebuf_size ) { if ( advance == samplebuf_size ) {
@ -868,9 +864,6 @@ main( int argc, char*argv[] )
{ {
carrier_band = -1; carrier_band = -1;
if ( carrier ) { if ( carrier ) {
carrier_nsamples -= noconfidence_nsamples;
if ( nframes_decoded > 0 )
carrier_nsamples += nsamples_overscan;
if ( !quiet_mode ) if ( !quiet_mode )
report_no_carrier(fskp, sample_rate, bfsk_data_rate, report_no_carrier(fskp, sample_rate, bfsk_data_rate,
nsamples_per_bit, nframes_decoded, nsamples_per_bit, nframes_decoded,
@ -886,13 +879,20 @@ main( int argc, char*argv[] )
* next time around the loop we continue searching from where * next time around the loop we continue searching from where
* we left off this time. */ * we left off this time. */
advance = try_max_nsamples; advance = try_max_nsamples;
noconfidence_nsamples += advance; debug_log("@ NOCONFIDENCE=%u advance=%u\n", noconfidence, advance);
debug_log("@ NOCONFIDENCE=%u advance=%u nc_nsamples=%lu\n",
noconfidence, advance, noconfidence_nsamples);
continue; continue;
} }
if ( !carrier ) { // Add a frame's worth of samples to the sample count
carrier_nsamples += nsamples_per_bit * (fskp->n_data_bits + 2);
if ( carrier ) {
// If we already had carrier, adjust sample count +start -overscan
carrier_nsamples += frame_start_sample;
carrier_nsamples -= nsamples_overscan;
} else {
if ( !quiet_mode ) { if ( !quiet_mode ) {
if ( bfsk_data_rate >= 100 ) if ( bfsk_data_rate >= 100 )
fprintf(stderr, "### CARRIER %u @ %.1f Hz ###\n", fprintf(stderr, "### CARRIER %u @ %.1f Hz ###\n",
@ -904,8 +904,6 @@ main( int argc, char*argv[] )
fskp->b_mark * fskp->band_width); fskp->b_mark * fskp->band_width);
} }
carrier = 1; carrier = 1;
/* back up carrier_nsamples to account for the imminent advance */
noconfidence_nsamples = frame_start_sample;
bfsk_framebits_decode(0, 0, 0); /* reset the frame processor */ bfsk_framebits_decode(0, 0, 0); /* reset the frame processor */
} }
@ -961,9 +959,6 @@ main( int argc, char*argv[] )
} /* end of the main loop */ } /* end of the main loop */
if ( carrier ) { if ( carrier ) {
carrier_nsamples -= noconfidence_nsamples;
if ( nframes_decoded > 0 )
carrier_nsamples += nsamples_overscan;
if ( !quiet_mode ) if ( !quiet_mode )
report_no_carrier(fskp, sample_rate, bfsk_data_rate, report_no_carrier(fskp, sample_rate, bfsk_data_rate,
nsamples_per_bit, nframes_decoded, nsamples_per_bit, nframes_decoded,