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 2cc9bf8e80447671dabd8cd3d3fadb536991d1e4..1a6072824483681aeeb5e78ea0f453efd827af7c 100644 (file)
--- 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 d5a50dee5691ca6d5109732f3f3f6800380df662..7691bab3daa6c7dab44feda7b86131d6e69a2ddc 100644 (file)
--- 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;