diff options
| author | Martin Braun <martin.braun@kit.edu> | 2013-05-12 14:16:56 +0200 |
|---|---|---|
| committer | Martin Braun <martin.braun@kit.edu> | 2013-05-12 14:18:15 +0200 |
| commit | cce6a69305cc475e8a37ba60ac1bc91659fa7f05 (patch) | |
| tree | 4a4bf432ad8e176cd54b36a289fad680c6b92965 /gr-digital/lib/packet_header_ofdm.cc | |
| parent | 9851f2377d099ffe72312375e7f761f66b664aa6 (diff) | |
| parent | 7be24afbf8857a5e827fb536a80d7a83e7b6aa31 (diff) | |
Merge branch 'master-ofdm', fixed conflicts
Diffstat (limited to 'gr-digital/lib/packet_header_ofdm.cc')
| -rw-r--r-- | gr-digital/lib/packet_header_ofdm.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gr-digital/lib/packet_header_ofdm.cc b/gr-digital/lib/packet_header_ofdm.cc index cd42273285..92ea69d40c 100644 --- a/gr-digital/lib/packet_header_ofdm.cc +++ b/gr-digital/lib/packet_header_ofdm.cc @@ -93,12 +93,15 @@ namespace gr { int packet_len = 0; // # of bytes in this frame for (unsigned i = 0; i < tags.size(); i++) { if (pmt::equal(tags[i].key, d_len_tag_key)) { - packet_len = pmt::to_long(tags[i].value); + // Convert bytes to complex symbols: + packet_len = pmt::to_long(tags[i].value) * 8 / d_bits_per_payload_sym; + if (pmt::to_long(tags[i].value) * 8 % d_bits_per_payload_sym) { + packet_len++; + } + tags[i].value = pmt::from_long(packet_len); break; } } - // Convert bytes to complex symbols: - packet_len = packet_len * 8 / d_bits_per_payload_sym; // frame_len == # of OFDM symbols in this frame int frame_len = packet_len / d_syms_per_set; |