Skip to content

Commit 23057d7

Browse files
drowe67drowe67
committed
removed 2020A
1 parent 9013dfd commit 23057d7

File tree

15 files changed

+29
-146
lines changed

15 files changed

+29
-146
lines changed

‎CMakeLists.txt‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -565,13 +565,6 @@ endif()
565565
./ch - - --No -22 |
566566
./ofdm_demod --mode 700E --ldpc --testframes -v 2 > /dev/null")
567567

568-
# 2020A MPP test, quite strong FEC on protected bits
569-
add_test(NAME test_OFDM_modem_2020A_mpp
570-
COMMAND sh -c "cd ${CMAKE_CURRENT_BINARY_DIR}/src;
571-
./ofdm_mod --in /dev/zero --mode 2020A --verbose 1 --ldpc --testframes 60 --clip 1 |
572-
./ch - - --No -22 --mpp --fading_dir ../unittest |
573-
./ofdm_demod --mode 2020A --testframes --ldpc --verbose 1 > /dev/null")
574-
575568
# 2020B AWGN test
576569
add_test(NAME test_OFDM_modem_2020B_AWGN
577570
COMMAND sh -c "cd ${CMAKE_CURRENT_BINARY_DIR}/src;
@@ -770,25 +763,16 @@ if(LPCNET)
770763
./freedv_rx 2020 - /dev/null --testframes"
771764
)
772765

773-
add_test(NAME test_freedv_api_2020_awgn
774-
COMMAND sh -c "cd ${CMAKE_CURRENT_BINARY_DIR}/src;
766+
add_test(NAME test_freedv_api_2020_awgn
767+
COMMAND sh -c "cd ${CMAKE_CURRENT_BINARY_DIR}/src;
775768
dd bs=32000 count=10 if=/dev/zero |
776769
./freedv_tx 2020 - - --testframes |
777770
./ch - - --No -24 |
778771
./freedv_rx 2020 - /dev/null --testframes"
779772
)
780773

781-
# quite strong protection of just protected bits (note compression (tx clipping) on)
782-
add_test(NAME test_freedv_api_2020A_mpp
783-
COMMAND sh -c "cd ${CMAKE_CURRENT_BINARY_DIR}/src;
784-
dd bs=32000 count=60 if=/dev/zero |
785-
./freedv_tx 2020A - - --testframes --clip 1 |
786-
./ch - - --No -24.5 --mpp --fading_dir ../unittest |
787-
./freedv_rx 2020A - /dev/null --testframes"
788-
)
789-
790774
add_test(NAME test_freedv_api_2020B_mpp
791-
COMMAND sh -c "cd ${CMAKE_CURRENT_BINARY_DIR}/src;
775+
COMMAND sh -c "cd ${CMAKE_CURRENT_BINARY_DIR}/src;
792776
dd bs=32000 count=60 if=/dev/zero |
793777
./freedv_tx 2020B - - --testframes --clip 1 |
794778
./ch - - --No -25 --mpp --fading_dir ../unittest |

‎script/test_2020x.sh‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,6 @@ run_sim $SPEECH_IN_16k_RAW 2020 clip awgn
147147
run_sim $SPEECH_IN_16k_RAW 2020 clip mpp
148148
run_sim $SPEECH_IN_16k_RAW 2020 clip mpd
149149

150-
run_sim $SPEECH_IN_16k_RAW 2020A clip awgn indopt
151-
run_sim $SPEECH_IN_16k_RAW 2020A clip mpp indopt
152-
run_sim $SPEECH_IN_16k_RAW 2020A clip mpp no_indopt
153-
run_sim $SPEECH_IN_16k_RAW 2020A clip mpd indopt
154-
run_sim $SPEECH_IN_16k_RAW 2020A clip mpd no_indopt
155-
156150
run_sim $SPEECH_IN_16k_RAW 2020B clip awgn indopt
157151
run_sim $SPEECH_IN_16k_RAW 2020B clip mpp indopt
158152
run_sim $SPEECH_IN_16k_RAW 2020B clip mpp no_indopt

‎src/freedv_2020.c‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ void freedv_2020x_open(struct freedv *f, int vq_type) {
4646
case FREEDV_MODE_2020:
4747
ofdm_init_mode("2020", &ofdm_config);
4848
break;
49-
case FREEDV_MODE_2020A:
50-
ofdm_init_mode("2020A", &ofdm_config);
51-
break;
5249
case FREEDV_MODE_2020B:
5350
ofdm_init_mode("2020B", &ofdm_config);
5451
break;
@@ -67,10 +64,6 @@ void freedv_2020x_open(struct freedv *f, int vq_type) {
6764
case FREEDV_MODE_2020:
6865
data_bits_per_frame = 312;
6966
break;
70-
case FREEDV_MODE_2020A:
71-
data_bits_per_frame = 312;
72-
f->ldpc->protection_mode = LDPC_PROT_2020A;
73-
break;
7467
case FREEDV_MODE_2020B:
7568
f->ldpc->protection_mode = LDPC_PROT_2020B;
7669
data_bits_per_frame = 156;

‎src/freedv_api.c‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ struct freedv *freedv_open(int mode) {
116116
case FREEDV_MODE_2020:
117117
adv.lpcnet_vq_type = 1; /* vanilla VQ */
118118
break;
119-
case FREEDV_MODE_2020A:
120119
case FREEDV_MODE_2020B:
121120
adv.lpcnet_vq_type = 2; /* index optimised VQ for theorectical robustness to single bit errors */
122121
break;
@@ -139,7 +138,6 @@ struct freedv *freedv_open_advanced(int mode, struct freedv_advanced *adv) {
139138
FDV_MODE_ACTIVE( FREEDV_MODE_2400B, mode) ||
140139
FDV_MODE_ACTIVE( FREEDV_MODE_800XA, mode) ||
141140
FDV_MODE_ACTIVE( FREEDV_MODE_2020, mode) ||
142-
FDV_MODE_ACTIVE( FREEDV_MODE_2020A, mode) ||
143141
FDV_MODE_ACTIVE( FREEDV_MODE_2020B, mode) ||
144142
FDV_MODE_ACTIVE( FREEDV_MODE_FSK_LDPC, mode) ||
145143
FDV_MODE_ACTIVE( FREEDV_MODE_DATAC0, mode) ||
@@ -158,7 +156,6 @@ struct freedv *freedv_open_advanced(int mode, struct freedv_advanced *adv) {
158156
if (FDV_MODE_ACTIVE( FREEDV_MODE_700E, mode)) freedv_ofdm_voice_open(f, "700E");
159157
#ifdef __LPCNET__
160158
if (FDV_MODE_ACTIVE( FREEDV_MODE_2020, mode) ||
161-
FDV_MODE_ACTIVE( FREEDV_MODE_2020A, mode) ||
162159
FDV_MODE_ACTIVE( FREEDV_MODE_2020B, mode))
163160
freedv_2020x_open(f, adv->lpcnet_vq_type);
164161
#endif
@@ -216,7 +213,6 @@ void freedv_close(struct freedv *freedv) {
216213
}
217214

218215
if (FDV_MODE_ACTIVE( FREEDV_MODE_2020, freedv->mode) ||
219-
FDV_MODE_ACTIVE( FREEDV_MODE_2020A, freedv->mode) ||
220216
FDV_MODE_ACTIVE( FREEDV_MODE_2020B, freedv->mode)) {
221217
FREE(freedv->codeword_symbols);
222218
FREE(freedv->codeword_amps);
@@ -272,7 +268,6 @@ static void codec2_encode_upacked(struct freedv *f, uint8_t unpacked_bits[], sho
272268

273269
static int is_ofdm_mode(struct freedv *f) {
274270
return FDV_MODE_ACTIVE( FREEDV_MODE_2020, f->mode) ||
275-
FDV_MODE_ACTIVE( FREEDV_MODE_2020A, f->mode) ||
276271
FDV_MODE_ACTIVE( FREEDV_MODE_2020B, f->mode) ||
277272
FDV_MODE_ACTIVE( FREEDV_MODE_700D, f->mode) ||
278273
FDV_MODE_ACTIVE( FREEDV_MODE_700E, f->mode) ||
@@ -360,8 +355,7 @@ void freedv_comptx(struct freedv *f, COMP mod_out[], short speech_in[]) {
360355
assert( FDV_MODE_ACTIVE( FREEDV_MODE_1600, f->mode) || FDV_MODE_ACTIVE( FREEDV_MODE_700C, f->mode) ||
361356
FDV_MODE_ACTIVE( FREEDV_MODE_2400A, f->mode) || FDV_MODE_ACTIVE( FREEDV_MODE_2400B, f->mode) ||
362357
FDV_MODE_ACTIVE( FREEDV_MODE_700D, f->mode) || FDV_MODE_ACTIVE( FREEDV_MODE_700E, f->mode) ||
363-
FDV_MODE_ACTIVE( FREEDV_MODE_2020, f->mode) || FDV_MODE_ACTIVE( FREEDV_MODE_2020A, f->mode) ||
364-
FDV_MODE_ACTIVE( FREEDV_MODE_2020B, f->mode));
358+
FDV_MODE_ACTIVE( FREEDV_MODE_2020, f->mode) || FDV_MODE_ACTIVE( FREEDV_MODE_2020B, f->mode));
365359

366360
if (FDV_MODE_ACTIVE( FREEDV_MODE_1600, f->mode)) {
367361
codec2_encode_upacked(f, f->tx_payload_bits, speech_in);
@@ -393,7 +387,6 @@ void freedv_comptx(struct freedv *f, COMP mod_out[], short speech_in[]) {
393387

394388
#ifdef __LPCNET__
395389
if (FDV_MODE_ACTIVE( FREEDV_MODE_2020, f->mode) ||
396-
FDV_MODE_ACTIVE( FREEDV_MODE_2020A, f->mode) ||
397390
FDV_MODE_ACTIVE( FREEDV_MODE_2020B, f->mode)) {
398391

399392
/* buffer up bits until we get enough encoded bits for interleaver */
@@ -757,8 +750,7 @@ int freedv_rx(struct freedv *f, short speech_out[], short demod_in[]) {
757750
}
758751

759752
if ( FDV_MODE_ACTIVE( FREEDV_MODE_1600, f->mode) || FDV_MODE_ACTIVE( FREEDV_MODE_700C, f->mode) ||
760-
FDV_MODE_ACTIVE( FREEDV_MODE_2020, f->mode) || FDV_MODE_ACTIVE( FREEDV_MODE_2020A, f->mode) ||
761-
FDV_MODE_ACTIVE( FREEDV_MODE_2020B, f->mode)) {
753+
FDV_MODE_ACTIVE( FREEDV_MODE_2020, f->mode) || FDV_MODE_ACTIVE( FREEDV_MODE_2020B, f->mode)) {
762754

763755
float gain = 1.0f;
764756

@@ -806,7 +798,6 @@ int freedv_comprx(struct freedv *f, short speech_out[], COMP demod_in[]) {
806798
}
807799

808800
if (FDV_MODE_ACTIVE( FREEDV_MODE_2020, f->mode) ||
809-
FDV_MODE_ACTIVE( FREEDV_MODE_2020A, f->mode) ||
810801
FDV_MODE_ACTIVE( FREEDV_MODE_2020B, f->mode)) {
811802
#ifdef __LPCNET__
812803
rx_status = freedv_comprx_2020(f, demod_in);
@@ -890,7 +881,7 @@ int freedv_bits_to_speech(struct freedv *f, short speech_out[], short demod_in[]
890881

891882
/* pass through received samples so we can hear what's going on, e.g. during tuning */
892883

893-
if ((f->mode == FREEDV_MODE_2020) || (f->mode == FREEDV_MODE_2020A) || (f->mode == FREEDV_MODE_2020B)) {
884+
if ((f->mode == FREEDV_MODE_2020) || (f->mode == FREEDV_MODE_2020B)) {
894885
/* 8kHz modem sample rate but 16 kHz speech sample
895886
rate, so we need to resample */
896887
nout = 2*f->nin_prev;
@@ -937,7 +928,6 @@ int freedv_bits_to_speech(struct freedv *f, short speech_out[], short demod_in[]
937928

938929
if (decode_speech) {
939930
if(FDV_MODE_ACTIVE( FREEDV_MODE_2020, f->mode) ||
940-
FDV_MODE_ACTIVE( FREEDV_MODE_2020A, f->mode) ||
941931
FDV_MODE_ACTIVE( FREEDV_MODE_2020B, f->mode)) {
942932
#ifdef __LPCNET__
943933
/* LPCNet decoder */
@@ -1132,7 +1122,6 @@ void freedv_set_callback_txt_sym(struct freedv *f, freedv_callback_rx_sym rx, vo
11321122
if (FDV_MODE_ACTIVE( FREEDV_MODE_700D, f->mode ) ||
11331123
FDV_MODE_ACTIVE( FREEDV_MODE_700E, f->mode ) ||
11341124
FDV_MODE_ACTIVE( FREEDV_MODE_2020, f->mode ) ||
1135-
FDV_MODE_ACTIVE( FREEDV_MODE_2020A, f->mode) ||
11361125
FDV_MODE_ACTIVE( FREEDV_MODE_2020B, f->mode)) {
11371126
f->freedv_put_next_rx_symbol = rx;
11381127
f->callback_state_sym = state;
@@ -1409,7 +1398,6 @@ int freedv_get_n_max_speech_samples(struct freedv *f) {
14091398
array */
14101399
int max_output_passthrough_samples;
14111400
if (FDV_MODE_ACTIVE(FREEDV_MODE_2020, f->mode) ||
1412-
FDV_MODE_ACTIVE(FREEDV_MODE_2020A, f->mode) ||
14131401
FDV_MODE_ACTIVE(FREEDV_MODE_2020B, f->mode))
14141402
// In 2020 we oversample the input modem samples from 8->16 kHz
14151403
max_output_passthrough_samples = 2*freedv_get_n_max_modem_samples(f);

‎src/freedv_api.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
#define FREEDV_MODE_700C 6
5151
#define FREEDV_MODE_700D 7
5252
#define FREEDV_MODE_2020 8
53-
#define FREEDV_MODE_2020A 15
5453
#define FREEDV_MODE_2020B 16
5554
#define FREEDV_MODE_700E 13
5655

@@ -115,9 +114,6 @@
115114
#if !defined(FREEDV_MODE_2020_EN)
116115
#define FREEDV_MODE_2020_EN FREEDV_MODE_EN_DEFAULT
117116
#endif
118-
#if !defined(FREEDV_MODE_2020A_EN)
119-
#define FREEDV_MODE_2020A_EN FREEDV_MODE_EN_DEFAULT
120-
#endif
121117
#if !defined(FREEDV_MODE_2020B_EN)
122118
#define FREEDV_MODE_2020B_EN FREEDV_MODE_EN_DEFAULT
123119
#endif

‎src/freedv_rx.c‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ int main(int argc, char *argv[]) {
7272

7373
char f2020[80] = {0};
7474
#ifdef __LPCNET__
75-
sprintf(f2020,"|2020|2020A|2020B");
75+
sprintf(f2020,"|2020|2020B");
7676
#endif
7777

7878
if (argc < 4) {
@@ -81,8 +81,8 @@ int main(int argc, char *argv[]) {
8181
"\n"
8282
" --discard Reset BER stats on loss of sync, helps us get sensible BER results\n"
8383
" --dpsk Use differential PSK rather than coherent PSK\n"
84-
" --indopt 0|1 Choose index optimised VQ for 2020/2020A/2020B, no effect other modes\n"
85-
" default for 2020/2020A/2020B 0/1/1 (off/on/on)\n"
84+
" --indopt 0|1 Choose index optimised VQ for 2020/2020B, no effect other modes\n"
85+
" default for 2020/2020B 0/1/1 (off/on/on)\n"
8686
" --reliabletext txt Send 'txt' using reliable text protocol\n"
8787
" --txtrx filename Store reliable text output to filename\n"
8888
" --squelch leveldB Set squelch level\n"
@@ -182,7 +182,6 @@ int main(int argc, char *argv[]) {
182182
if (!strcmp(argv[dx],"800XA")) mode = FREEDV_MODE_800XA;
183183
#ifdef __LPCNET__
184184
if (!strcmp(argv[dx],"2020")) mode = FREEDV_MODE_2020;
185-
if (!strcmp(argv[dx],"2020A")) mode = FREEDV_MODE_2020A;
186185
if (!strcmp(argv[dx],"2020B")) mode = FREEDV_MODE_2020B;
187186
#endif
188187
if (mode == -1) {
@@ -318,8 +317,7 @@ int main(int argc, char *argv[]) {
318317
fprintf(stderr, "BER......: %5.4f Tbits: %8d Terrs: %8d\n",
319318
(double)uncoded_ber, Tbits, Terrs);
320319
if ((mode == FREEDV_MODE_700D) || (mode == FREEDV_MODE_700E) ||
321-
(mode == FREEDV_MODE_2020) || (mode == FREEDV_MODE_2020A) ||
322-
(mode == FREEDV_MODE_2020B) ) {
320+
(mode == FREEDV_MODE_2020) || (mode == FREEDV_MODE_2020B) ) {
323321
int Tbits_coded = freedv_get_total_bits_coded(freedv);
324322
int Terrs_coded = freedv_get_total_bit_errors_coded(freedv);
325323
float coded_ber = (float)Terrs_coded/Tbits_coded;

‎src/freedv_tx.c‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ int main(int argc, char *argv[]) {
6666
reliable_text_t reliable_text_obj;
6767
char f2020[80] = {0};
6868
#ifdef __LPCNET__
69-
sprintf(f2020,"|2020|2020A|2020");
69+
sprintf(f2020,"|2020|2020");
7070
#endif
7171

7272
if (argc < 4) {
@@ -76,8 +76,8 @@ int main(int argc, char *argv[]) {
7676
" --clip 0|1 Clipping (compression) of modem output samples for reduced PAPR\n"
7777
" and higher average power\n"
7878
" --dpsk Use differential PSK rather than coherent PSK\n"
79-
" --indopt 0|1 Choose index optimised VQ for 2020/2020A/2020B, no effect other modes\n"
80-
" default for 2020/2020A/2020B 0/1/1 (off/on/on)\n"
79+
" --indopt 0|1 Choose index optimised VQ for 2020/2020B, no effect other modes\n"
80+
" default for 2020/2020B 0/1/1 (off/on/on)\n"
8181
" --reliabletext txt Send 'txt' using reliable text protocol\n"
8282
" --testframes Send testframe instead of coded speech. Number of testsframes depends on\n"
8383
" length of speech input file\n"
@@ -152,7 +152,6 @@ int main(int argc, char *argv[]) {
152152
if (!strcmp(argv[dx],"800XA")) mode = FREEDV_MODE_800XA;
153153
#ifdef __LPCNET__
154154
if (!strcmp(argv[dx],"2020")) mode = FREEDV_MODE_2020;
155-
if (!strcmp(argv[dx],"2020A")) mode = FREEDV_MODE_2020A;
156155
if (!strcmp(argv[dx],"2020B")) mode = FREEDV_MODE_2020B;
157156
#endif
158157
if (mode == -1) {

‎src/interldpc.c‎

Lines changed: 4 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -88,24 +88,6 @@ void ldpc_encode_frame(struct LDPC *ldpc, int codeword[], unsigned char tx_bits_
8888
encode(ldpc, tx_bits_char_padded, pbits);
8989
break;
9090

91-
case LDPC_PROT_2020A:
92-
/* We only want to keep 1 stage VQ data bits, 0..10 in each 52 bit codec
93-
frame. There are 6 codec frames 6x52=312 bits, 396 data bits in codeword.
94-
So we want to protect 11*6 = 66 bits total, the rest set to 1s. Hmm, however
95-
that's just for parity generation. We still want to send all of the bits
96-
unmodified.
97-
*/
98-
memcpy(tx_bits_char_padded, tx_bits_char, ldpc->data_bits_per_frame);
99-
for(codec_frame=0; codec_frame<6; codec_frame++)
100-
for(i=11; i<52; i++)
101-
tx_bits_char_padded[codec_frame*52+i] = 1;
102-
assert(codec_frame*52 == ldpc->data_bits_per_frame);
103-
for (i = ldpc->data_bits_per_frame; i < ldpc->ldpc_data_bits_per_frame; i++)
104-
tx_bits_char_padded[i] = 1;
105-
encode(ldpc, tx_bits_char_padded, pbits);
106-
107-
break;
108-
10991
case LDPC_PROT_2020B:
11092
/* We only want to protect the stage 1 VQ data bits, 0..10 in
11193
each 52 bit codec frame. There are 3 codec frames 3x52=156
@@ -176,44 +158,11 @@ void ldpc_decode_frame(struct LDPC *ldpc, int *parityCheckCount, int *iter, uint
176158
llr_full_codeword[i] = llr[i - unused_data_bits];
177159
*iter = run_ldpc_decoder(ldpc, out_char, llr_full_codeword, parityCheckCount);
178160
break;
179-
case LDPC_PROT_2020A:
180-
/* 2020A: 2020 waveform, but unequal error protection.
181-
Only the stage1 VQ index of each LPCNet vocoder frames
182-
is protected. This means the code rate is quite low,
183-
and protection quite high for these important bits.
184-
The rest of the codec frame is unprotected. */
185-
186-
// received data bits
187-
for (i = 0; i < ldpc->data_bits_per_frame; i++) {
188-
llr_full_codeword[i] = llr[i];
189-
// uncoded bits pass through
190-
out_char[i] = llr[i] < 0;
191-
}
192-
193-
// set up known bits
194-
for(codec_frame=0; codec_frame<6; codec_frame++)
195-
for(i=11; i<52; i++)
196-
llr_full_codeword[codec_frame*52+i] = -100.0f;
197-
assert(codec_frame*52 == ldpc->data_bits_per_frame);
198-
199-
// known bits ... so really likely
200-
for (i = ldpc->data_bits_per_frame; i < ldpc->ldpc_data_bits_per_frame; i++)
201-
llr_full_codeword[i] = -100.0f;
202-
// parity bits at end
203-
for (i = ldpc->ldpc_data_bits_per_frame; i < ldpc->ldpc_coded_bits_per_frame; i++)
204-
llr_full_codeword[i] = llr[i - unused_data_bits];
205-
*iter = run_ldpc_decoder(ldpc, out_char_ldpc, llr_full_codeword, parityCheckCount);
206-
207-
// replace our_char[] bits with decoded bits
208-
for(codec_frame=0; codec_frame<6; codec_frame++)
209-
for(i=0; i<11; i++)
210-
out_char[codec_frame*52+i] = out_char_ldpc[codec_frame*52+i];
211-
break;
212161
case LDPC_PROT_2020B:
213-
/* 2020B waveform, with unequal error protection. As per
214-
2020A, only the stage1 VQ index of each LPCNet vocoder
215-
frames is protected. In this case the FEC codeword is much
216-
smaller than the payload data. */
162+
/* 2020B waveform, with unequal error protection. Only the
163+
stage1 VQ index of each LPCNet vocoder frames is
164+
protected. In this case the FEC codeword is much smaller
165+
than the payload data. */
217166

218167
// set up LDPC codeword
219168
for(j=0,codec_frame=0; codec_frame<3; codec_frame++)
@@ -314,18 +263,6 @@ void count_errors_protection_mode(int protection_mode, int *pNerrs, int *pNcoded
314263
Ncoded++;
315264
}
316265
break;
317-
case LDPC_PROT_2020A:
318-
/* We only protect bits 0..10 in each 52 bit LPCNet codec
319-
frame. There are 6 codec frames 6x52=312 data bits, of
320-
which only 11*6 = 66 bits are protected.
321-
*/
322-
for(int codec_frame=0; codec_frame<6; codec_frame++) {
323-
for(i=0; i<11; i++) {
324-
if (tx_bits[codec_frame*52+i] != rx_bits[codec_frame*52+i]) Nerrs++;
325-
Ncoded++;
326-
}
327-
}
328-
break;
329266
case LDPC_PROT_2020B:
330267
/* We only protect bits 0..10 in each 52 bit LPCNet codec
331268
frame. There are 3 codec frames 3x52=156 data bits, of

‎src/interldpc.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
/* LDPC unequal protection modes */
3838
#define LDPC_PROT_EQUAL 0 /* all bits in LDPC codeword used, e.g. 700D/700E */
3939
#define LDPC_PROT_2020 1 /* (504,396) but some data bits unused */
40-
#define LDPC_PROT_2020A 2 /* (504,396) but we only protect stage1 VQ in each LPCNet frame */
4140
#define LDPC_PROT_2020B 3 /* (112,56) but we only protect stage1 VQ in each LPCNet frame */
4241

4342
void set_up_ldpc_constants(struct LDPC *ldpc, int code_length, int parity_bits);

‎src/ofdm.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ static void allocate_tx_bpf(struct OFDM *ofdm) {
543543
quisk_filt_cfInit(ofdm->tx_bpf, filtP650S900, sizeof (filtP650S900) / sizeof (float));
544544
quisk_cfTune(ofdm->tx_bpf, ofdm->tx_centre / ofdm->fs);
545545
}
546-
else if (!strcmp(ofdm->mode, "700E") || !strcmp(ofdm->mode, "2020") || !strcmp(ofdm->mode, "2020A")) {
546+
else if (!strcmp(ofdm->mode, "700E") || !strcmp(ofdm->mode, "2020")) {
547547
quisk_filt_cfInit(ofdm->tx_bpf, filtP900S1100, sizeof (filtP900S1100) / sizeof (float));
548548
quisk_cfTune(ofdm->tx_bpf, ofdm->tx_centre / ofdm->fs);
549549
}
@@ -945,7 +945,7 @@ void ofdm_hilbert_clipper(struct OFDM *ofdm, complex float *tx, size_t n) {
945945
/* BPF to remove out of band energy clipper introduces */
946946
if (ofdm->tx_bpf_en) {
947947
assert(!strcmp(ofdm->mode, "700D") || !strcmp(ofdm->mode, "700E")
948-
|| !strcmp(ofdm->mode, "2020") || !strcmp(ofdm->mode, "2020A") || !strcmp(ofdm->mode, "2020B")
948+
|| !strcmp(ofdm->mode, "2020") || !strcmp(ofdm->mode, "2020B")
949949
|| !strcmp(ofdm->mode, "datac0") || !strcmp(ofdm->mode, "datac3"));
950950
assert(ofdm->tx_bpf != NULL);
951951
complex float tx_filt[n];

0 commit comments

Comments
 (0)