From: drowe67 Date: Sat, 14 Jan 2017 04:51:41 +0000 (+0000) Subject: correct sample rate fpor 700 B&C X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=4f7bdba962972f4cfba4f5cd19d844a9c71d1c04;p=freetel-svn-tracking.git correct sample rate fpor 700 B&C git-svn-id: https://svn.code.sf.net/p/freetel/code@2970 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/codec2-dev/src/freedv_api.c b/codec2-dev/src/freedv_api.c index 2cc9bf8e..1a607282 100644 --- a/codec2-dev/src/freedv_api.c +++ b/codec2-dev/src/freedv_api.c @@ -140,10 +140,10 @@ struct freedv *freedv_open(int mode) { f->cohpsk = cohpsk_create(); f->nin = COHPSK_NOM_SAMPLES_PER_FRAME; - f->n_nat_modem_samples = COHPSK_NOM_SAMPLES_PER_FRAME; // native modem samples as used by the modem - f->n_nom_modem_samples = f->n_nat_modem_samples * 8000 / 7500; // number of samples after native samples are interpolated to 8000 sps - f->n_max_modem_samples = COHPSK_MAX_SAMPLES_PER_FRAME * 8000 / 7500 + 1; - f->modem_sample_rate = COHPSK_FS; /* note wierd sample rate */ + f->n_nat_modem_samples = COHPSK_NOM_SAMPLES_PER_FRAME; // native modem samples as used by the modem + f->n_nom_modem_samples = f->n_nat_modem_samples * FS / COHPSK_FS; // number of samples after native samples are interpolated to 8000 sps + f->n_max_modem_samples = COHPSK_MAX_SAMPLES_PER_FRAME * FS / COHPSK_FS + 1; + f->modem_sample_rate = FS; /* note wierd sample rate tamed by interpolator */ f->clip = 1; nbit = COHPSK_BITS_PER_FRAME; f->tx_bits = (int*)malloc(nbit*sizeof(int)); diff --git a/codec2-dev/src/freedv_api.h b/codec2-dev/src/freedv_api.h index d5a50dee..7691bab3 100644 --- a/codec2-dev/src/freedv_api.h +++ b/codec2-dev/src/freedv_api.h @@ -44,6 +44,7 @@ #define FREEDV_MODE_2400A 3 #define FREEDV_MODE_2400B 4 #define FREEDV_MODE_800XA 5 +#define FREEDV_MODE_700C 6 struct freedv;