diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-01 21:37:12 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-01 21:37:12 -0700 |
| commit | 5052b5735124bcae0568ec410df2785784e2541b (patch) | |
| tree | 62dc16e974ffce8e8750bf1f0ec8b5126a1adf8e /gr-dtv | |
| parent | b5b9334286a74aa92ff48ed63ffa6e8349881bf0 (diff) | |
| parent | 75b6e340f82e59d00badeba70263e755075b49c0 (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gr-dtv')
| -rw-r--r-- | gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc | 5 | ||||
| -rw-r--r-- | gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc index 4f24f0258f..54d25e49ea 100644 --- a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc @@ -161,14 +161,13 @@ namespace gr { // We output one byte for a symbol of m bits // The out/in rate in bytes is: 8n/km (Bytes) - assert(d_ninput % 1); - assert(d_noutput % 1512); + assert(d_noutput % 1512 == 0); // Set output items multiple of 4 set_output_multiple(4); // Set relative rate out/in - assert((d_noutput * d_k * d_m) % (d_ninput * 8 * d_n)); + assert((d_noutput * d_k * d_m) % (d_ninput * 8 * d_n) == 0); set_relative_rate((float)(d_ninput * 8 * d_n) / (float)d_noutput * d_k * d_m); // calculate in and out block sizes diff --git a/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc b/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc index 3b0f9fddfb..8e22d8df5a 100644 --- a/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc @@ -578,7 +578,7 @@ namespace gr { * * out/in rate is therefore km/8n in bytes */ - assert((d_k * d_m) % (8 * d_n)); + assert((d_k * d_m) % (8 * d_n) == 0); set_relative_rate((d_k * d_m) / (8 * d_n)); assert ((d_bsize * d_n) % d_m == 0); |