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

pass user data using uint8_t array

Browse source
This commit is contained in:
Ahmet Inan 2021-06-10 08:22:04 +02:00
commit aa28a2e58d
2 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

27
decode.cc
View file

@ -230,7 +230,7 @@ struct Decoder
}
return sum / (count * symbol_len/2);
}
Decoder(value *out, DSP::ReadPCM<value> *pcm, int skip_count) :
Decoder(uint8_t *out, DSP::ReadPCM<value> *pcm, int skip_count) :
pcm(pcm), resample(rate, (rate * 19) / 40, 2), correlator(mls0_seq()), crc(0xA8F4)
{
CODE::BoseChaudhuriHocquenghemGenerator<255, 71>::matrix(genmat, true, {
@ -329,8 +329,16 @@ struct Decoder
for (int i = 0; i < data_cols; ++i)
head[bin(i+data_off)] = fdom[bin(i+data_off)];
fwd(fdom, cur += symbol_len+guard_len);
for (int i = 0; i < data_cols; ++i)
Mod::hard(out+Mod::BITS*(data_cols*j+i), fdom[bin(i+data_off)] / head[bin(i+data_off)]);
for (int i = 0; i < data_cols; ++i) {
value tmp[Mod::BITS];
Mod::hard(tmp, fdom[bin(i+data_off)] / head[bin(i+data_off)]);
for (int k = 0; k < Mod::BITS; ++k) {
int l = Mod::BITS * (data_cols * j + i) + k;
if (l % 8 == 0)
out[l/8] = 0;
out[l/8] |= (tmp[k] < 0) << (l % 8);
}
}
}
}
};
@ -359,8 +367,8 @@ int main(int argc, char **argv)
if (argc > 3)
skip_count = std::atoi(argv[3]);
const int length = 64800;
value *output_data = new value[length];
const int length = 64800 / 8;
uint8_t *output_data = new uint8_t[length];
switch (input_file.rate()) {
case 8000:
@ -385,13 +393,8 @@ int main(int argc, char **argv)
std::cerr << "Couldn't open file \"" << output_name << "\" for writing." << std::endl;
return 1;
}
for (int i = 0, c = 0; i < length; ++i) {
c |= (output_data[i] < 0) << (i % 8);
if (i % 8 == 7) {
output_file.put(c);
c = 0;
}
}
for (int i = 0; i < length; ++i)
output_file.put(output_data[i]);
delete []output_data;
return 0;
}

23
encode.cc
View file

@ -128,7 +128,7 @@ struct Encoder
fdom[bin(i+mls1_off)] *= (1 - 2 * seq4());
symbol();
}
Encoder(DSP::WritePCM<value> *pcm, value *inp, int freq_off, uint64_t call_sign) :
Encoder(DSP::WritePCM<value> *pcm, uint8_t *inp, int freq_off, uint64_t call_sign) :
pcm(pcm), crc(0xA8F4), bchenc({
0b100011101, 0b101110111, 0b111110011, 0b101101001,
0b110111101, 0b111100111, 0b100101011, 0b111010111,
@ -146,8 +146,14 @@ struct Encoder
meta_data((call_sign << 8) | 2);
pilot_block();
for (int j = 0; j < data_rows; ++j) {
for (int i = 0; i < data_cols; ++i)
fdom[bin(i+data_off)] *= Mod::map(inp+Mod::BITS*(data_cols*j+i));
for (int i = 0; i < data_cols; ++i) {
value tmp[Mod::BITS];
for (int k = 0; k < Mod::BITS; ++k) {
int l = Mod::BITS * (data_cols * j + i) + k;
tmp[k] = 1 - 2 * ((inp[l/8] >> (l % 8)) & 1);
}
fdom[bin(i+data_off)] *= Mod::map(tmp);
}
symbol();
}
schmidl_cox();
@ -218,13 +224,10 @@ int main(int argc, char **argv)
std::cerr << "Couldn't open file \"" << input_name << "\" for reading." << std::endl;
return 1;
}
const int length = 64800;
value *input_data = new value[length];
for (int i = 0, c = 0; i < length; ++i, c >>= 1) {
if (i % 8 == 0)
c = input_file.get();
input_data[i] = 1 - 2 * (c & 1);
}
const int length = 64800 / 8;
uint8_t *input_data = new uint8_t[length];
for (int i = 0; i < length; ++i)
input_data[i] = input_file.get();
DSP::WriteWAV<value> output_file(output_name, output_rate, output_bits, output_chan);
output_file.silence(output_rate);