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

fsk: move advance to top of loop

Browse Source
This commit is contained in:
Kamal Mostafa 2011-06-06 21:36:23 -07:00
parent 0509066f34
commit 35121ab63c
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/fsk.c
View File

@ -470,11 +470,23 @@ main( int argc, char*argv[] )
int carrier = 0; int carrier = 0;
unsigned int noconfidence = 0; unsigned int noconfidence = 0;
unsigned int advance = 0;
while ( 1 ) { while ( 1 ) {
if ( advance ) {
memmove(samples, samples+advance,
(fill_nsamples-advance)*sizeof(float));
read_bufptr = samples + (fill_nsamples-advance);
read_nsamples = advance;
}
debug_log( "@read samples+%ld n=%lu\n", debug_log( "@read samples+%ld n=%lu\n",
read_bufptr - samples, read_nsamples); read_bufptr - samples, read_nsamples);
assert ( read_nsamples <= buf_nsamples );
assert ( read_nsamples > 0 );
if ((ret=simpleaudio_read(sa, read_bufptr, read_nsamples)) <= 0) if ((ret=simpleaudio_read(sa, read_bufptr, read_nsamples)) <= 0)
break; break;
@ -540,8 +552,6 @@ debug_log( "--------------------------\n");
#define FSK_MIN_CONFIDENCE 0.5 /* not critical */ #define FSK_MIN_CONFIDENCE 0.5 /* not critical */
unsigned int advance;
if ( confidence <= FSK_MIN_CONFIDENCE ) { if ( confidence <= FSK_MIN_CONFIDENCE ) {
if ( carrier ) { if ( carrier ) {
@ -585,7 +595,7 @@ debug_log( "--------------------------\n");
* for clock skew, so ... * for clock skew, so ...
* *
* advance = 9.5 bits */ * advance = 9.5 bits */
advance = frame_start_sample + nsamples_per_bit * 9.5; advance = frame_start_sample + nsamples_per_bit * (float)(fskp->n_data_bits + 1.5);
debug_log( "@ frame_start=%u advance=%u\n", frame_start_sample, advance); debug_log( "@ frame_start=%u advance=%u\n", frame_start_sample, advance);
@ -593,16 +603,9 @@ debug_log( "--------------------------\n");
printf( "%c", the_byte ); printf( "%c", the_byte );
fflush(stdout); fflush(stdout);
} }
memmove(samples, samples+advance,
(fill_nsamples-advance)*sizeof(float));
read_bufptr = samples + (fill_nsamples-advance);
read_nsamples = advance;
assert ( read_nsamples <= buf_nsamples );
assert ( read_nsamples > 0 );
} }
if ( ret != 0 ) if ( ret != 0 )