diff options
| author | Josh Morman <jmorman@perspectalabs.com> | 2021-03-08 08:47:57 -0500 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-03-08 17:42:59 -0500 |
| commit | 5895df85a887fbd2d8bb1d4751e95a686471d638 (patch) | |
| tree | ad889ae6d88ac625063fcb32e9385ded2ba9a4f3 | |
| parent | 032ac81a4cddc36f7d184500a5bb2e7d8419014b (diff) | |
dtv/atsc: fix indexing error / replace magic num
There was an extra factor of 12 in the output copy of viterbi decoder
when the noutput_items was > 1 (which doesn't happen all the time)
leading to a glitch in the output video.
Also, replaced the hardcoded 832 with the appropriate enum
Signed-off-by: Josh Morman <jmorman@perspectalabs.com>
| -rw-r--r-- | gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.cc b/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.cc index 1e53c78aba..5b807f3fce 100644 --- a/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.cc +++ b/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.cc @@ -97,9 +97,10 @@ int atsc_viterbi_decoder_impl::work(int noutput_items, /* Build a continuous symbol buffer for each encoder */ for (unsigned int encoder = 0; encoder < NCODERS; encoder++) for (unsigned int k = 0; k < enco_which_max; k++) - symbols[encoder][k] = in[(i + (enco_which_syms[encoder][k] / 832)) * - ATSC_DATA_SEGMENT_LENGTH + - enco_which_syms[encoder][k] % 832]; + symbols[encoder][k] = + in[(i + (enco_which_syms[encoder][k] / ATSC_DATA_SEGMENT_LENGTH)) * + ATSC_DATA_SEGMENT_LENGTH + + enco_which_syms[encoder][k] % ATSC_DATA_SEGMENT_LENGTH]; /* Now run each of the 12 Viterbi decoders over their subset of @@ -130,8 +131,8 @@ int atsc_viterbi_decoder_impl::work(int noutput_items, throw std::runtime_error("No plinfo on tag"); } - memcpy(&out[(i * NCODERS + j) * ATSC_MPEG_RS_ENCODED_LENGTH], - &out_copy[j * OUTPUT_SIZE / NCODERS], + memcpy(&out[(i + j) * ATSC_MPEG_RS_ENCODED_LENGTH], + &out_copy[j * ATSC_MPEG_RS_ENCODED_LENGTH], ATSC_MPEG_RS_ENCODED_LENGTH * sizeof(out_copy[0])); plinfo pli_out; |