diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-11-27 14:38:38 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-11-27 14:38:38 -0800 |
| commit | 521729b2ccb483cbccf83fb23ffbdecbb68ad8df (patch) | |
| tree | c767b47fb7d280828aa92ff4a3704a9ee0151e0d /gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc | |
| parent | e28e7d0ddc46ebe2a70e67420f243b0f5eedb281 (diff) | |
| parent | db1a0a96785577c20dd254e6825eac050cf4d59b (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc')
| -rw-r--r-- | gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc b/gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc index 568aac940a..84328e1200 100644 --- a/gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc +++ b/gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc @@ -369,12 +369,12 @@ namespace gr { void dvb_ldpc_bb_impl::forecast (int noutput_items, gr_vector_int &ninput_items_required) { - ninput_items_required[0] = (noutput_items / frame_size) * nbch; + ninput_items_required[0] = (noutput_items / frame_size) * nbch; } #define LDPC_BF(TABLE_NAME, ROWS) \ for (int row = 0; row < ROWS; row++) { \ - for(int n = 0; n < 360; n++) { \ + for (int n = 0; n < 360; n++) { \ for (int col = 1; col <= TABLE_NAME[row][0]; col++) { \ ldpc_encode.p[index] = (TABLE_NAME[row][col] + (n * q)) % pbits; \ ldpc_encode.d[index] = im; \ @@ -606,7 +606,7 @@ for (int row = 0; row < ROWS; row++) { \ unsigned char *out = (unsigned char *) output_items[0]; const unsigned char *d; unsigned char *p; - unsigned char *b; + unsigned char *b = (unsigned char *) output_items[0]; unsigned char *s; // Calculate the number of parity bits int plen = (frame_size_real + Xp) - nbch; @@ -657,7 +657,7 @@ for (int row = 0; row < ROWS; row++) { \ p[j] ^= p[j-1]; } if (signal_constellation == MOD_128APSK) { - for(int j = 0; j < 6; j++) { + for (int j = 0; j < 6; j++) { p[j + plen] = 0; } } |