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

fixed black magic and rx rate calc

Browse Source
This commit is contained in:
Kamal Mostafa 2011-05-28 08:55:42 -07:00
parent a5492bbc6a
commit a429eff466
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/minimodem.c
View File

@ -148,12 +148,18 @@ int main(int argc, char*argv[]) {
*/ */
int nsamples = sample_rate / decode_rate; int nsamples = sample_rate / decode_rate;
#if 1 #if 0
/* BLACK MAGIC! Run the decoder 1% slow ... */ /* BLACK MAGIC! Run the decoder 1% slow ... */
int nsamples_speedup = nsamples * 0.01; int nsamples_adjust = nsamples * 0.01;
if ( nsamples_speedup == 0 ) if ( nsamples_adjust == 0 )
nsamples_speedup = 1; nsamples_adjust = 1;
nsamples += nsamples_speedup; // BLACK MAGIC! nsamples += nsamples_adjust;
#elif 1
/* BLACK MAGIC! Run the decoder 1% fast ... */
int nsamples_adjust = nsamples * 0.01;
if ( nsamples_adjust == 0 )
nsamples_adjust = 1;
nsamples -= nsamples_adjust;
#endif #endif
// float magscalar = 1.0 / (fftsize/2.0); /* normalize fftw output */ // float magscalar = 1.0 / (fftsize/2.0); /* normalize fftw output */
@ -198,6 +204,7 @@ int main(int argc, char*argv[]) {
ret = 1; ret = 1;
break; break;
} }
carrier_nsamples += nframes;
#define TRICK #define TRICK
@ -258,6 +265,7 @@ reprocess_audio:
mag_mark + mag_space > CD_MIN_TONEMAG mag_mark + mag_space > CD_MIN_TONEMAG
&& &&
fabs(msdelta) > CD_MIN_MSDELTA_RATIO * MAX(mag_mark, mag_space); fabs(msdelta) > CD_MIN_MSDELTA_RATIO * MAX(mag_mark, mag_space);
// MIN(mag_mark, mag_space) < 0.1;
#ifdef TRICK #ifdef TRICK
@ -297,6 +305,7 @@ reprocess_audio:
ret = 1; ret = 1;
break; break;
} }
carrier_nsamples += nframes;
goto reprocess_audio; goto reprocess_audio;
} }
} }
@ -314,8 +323,6 @@ reprocess_audio:
if ( carrier_detect ) if ( carrier_detect )
{ {
// carrier_nsamples += nsamples + skipped_frames;
carrier_nsamples += nsamples - skipped_frames;
carrier_nsymbits++; carrier_nsymbits++;
bit = signbit(msdelta) ? 0 : 1; bit = signbit(msdelta) ? 0 : 1;