Mirror/aicodix___modem
1
0
Fork 0
mirror of https://github.com/aicodix/modem.git synced 2026-04-27 22:35:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

sprinkle QAM64 with QAM4 or QAM16 to fill in the gaps

Browse source
This commit is contained in:
Ahmet Inan 2025-07-01 11:27:15 +02:00
commit 464d4a96c2
2 changed files with 18 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

36
decode.cc
View file

@ -118,32 +118,9 @@ struct Decoder
fdom[bin(i+tone_off)] = prv * (cur = nrz(seq0()));
return fdom;
}
cmplx mod_map(code_type *b)
void demap_bits(code_type *b, cmplx c, value precision, int bits)
{
switch (mod_bits) {
case 2:
return PhaseShiftKeying<4, cmplx, code_type>::map(b);
case 4:
return QuadratureAmplitudeModulation<16, cmplx, code_type>::map(b);
case 6:
return QuadratureAmplitudeModulation<64, cmplx, code_type>::map(b);
}
return 0;
}
void mod_hard(code_type *b, cmplx c)
{
switch (mod_bits) {
case 2:
return PhaseShiftKeying<4, cmplx, code_type>::hard(b, c);
case 4:
return QuadratureAmplitudeModulation<16, cmplx, code_type>::hard(b, c);
case 6:
return QuadratureAmplitudeModulation<64, cmplx, code_type>::hard(b, c);
}
}
void mod_soft(code_type *b, cmplx c, value precision)
{
switch (mod_bits) {
switch (bits) {
case 2:
return PhaseShiftKeying<4, cmplx, code_type>::soft(b, c, precision);
case 4:
@ -369,8 +346,13 @@ struct Decoder
continue;
if (i % block_length == roff)
continue;
mod_soft(perm+k, demod[tone_count*j+i], precision);
k += mod_bits;
int bits = mod_bits;
if (oper_mode == 7 && k % 32 == 30)
bits = 2;
else if (oper_mode == 8 && k % 64 == 60)
bits = 4;
demap_bits(perm+k, demod[tone_count*j+i], precision, bits);
k += bits;
}
}
std::cerr << std::endl;

13
encode.cc
View file

@ -163,9 +163,9 @@ struct Encoder
symbol(false);
symbol(false, false);
}
cmplx mod_map(code_type *b)
cmplx map_bits(code_type *b, int bits)
{
switch (mod_bits) {
switch (bits) {
case 2:
return PhaseShiftKeying<4, cmplx, code_type>::map(b);
case 4:
@ -363,8 +363,13 @@ struct Encoder
} else if (i % block_length == roff) {
tone[i] = 0;
} else {
tone[i] = mod_map(perm+k);
k += mod_bits;
int bits = mod_bits;
if (oper_mode == 7 && k % 32 == 30)
bits = 2;
else if (oper_mode == 8 && k % 64 == 60)
bits = 4;
tone[i] = map_bits(perm+k, bits);
k += bits;
}
}
symbol();