From: okcsampson Date: Fri, 16 Jun 2017 20:44:46 +0000 (+0000) Subject: Add max samples to ofdm_internal.h X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=6dec01251f431b81e82cc5632f2f3ce352806d51;p=freetel-svn-tracking.git Add max samples to ofdm_internal.h git-svn-id: https://svn.code.sf.net/p/freetel/code@3201 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/codec2-dev/src/ofdm.c b/codec2-dev/src/ofdm.c index 23e676c8..5b413560 100644 --- a/codec2-dev/src/ofdm.c +++ b/codec2-dev/src/ofdm.c @@ -304,7 +304,6 @@ struct OFDM *ofdm_create() { } } - for (i = 0; i < (OFDM_NS + 3); i++) { for (j = 0; j < (OFDM_NC + 2); j++) { ofdm->rx_sym[i][j] = 0.0f + 0.0f * I; diff --git a/codec2-dev/src/ofdm_internal.h b/codec2-dev/src/ofdm_internal.h index fcebfca1..b3f82ac8 100644 --- a/codec2-dev/src/ofdm_internal.h +++ b/codec2-dev/src/ofdm_internal.h @@ -62,11 +62,12 @@ extern "C" { #define OFDM_NCP ((int)(OFDM_TCP * OFDM_FS)) #endif -#define OFDM_FTWINDOWWIDTH 11 -#define OFDM_BITSPERFRAME ((OFDM_NS - 1) * (OFDM_NC * OFDM_BPS)) -#define OFDM_ROWSPERFRAME (OFDM_BITSPERFRAME / (OFDM_NC * OFDM_BPS)) -#define OFDM_SAMPLESPERFRAME (OFDM_NS * (OFDM_M + OFDM_NCP)) -#define OFDM_RXBUF (3 * OFDM_SAMPLESPERFRAME + 3 * (OFDM_M + OFDM_NCP)) +#define OFDM_FTWINDOWWIDTH 11 +#define OFDM_BITSPERFRAME ((OFDM_NS - 1) * (OFDM_NC * OFDM_BPS)) +#define OFDM_ROWSPERFRAME (OFDM_BITSPERFRAME / (OFDM_NC * OFDM_BPS)) +#define OFDM_SAMPLESPERFRAME (OFDM_NS * (OFDM_M + OFDM_NCP)) +#define OFDM_MAX_SAMPLESPERFRAME (OFDM_SAMPLESPERFRAME + (OFDM_M + OFDM_NCP)/4) +#define OFDM_RXBUF (3 * OFDM_SAMPLESPERFRAME + 3 * (OFDM_M + OFDM_NCP)) struct OFDM { float foff_est_gain;