diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-06-13 09:54:38 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-06-13 19:49:13 +0200 |
| commit | 3c74432709c61a7cb914c51748eb73bbbf35af38 (patch) | |
| tree | 0078ea1245829e86b24dfaa90ca51061544bcd3e /src/dabOutput | |
| parent | c714196bc8e2b3d4ecead22855096753b1b46e40 (diff) | |
| download | dabmux-3c74432709c61a7cb914c51748eb73bbbf35af38.tar.gz dabmux-3c74432709c61a7cb914c51748eb73bbbf35af38.tar.bz2 dabmux-3c74432709c61a7cb914c51748eb73bbbf35af38.zip | |
EDI PFT corrections
Diffstat (limited to 'src/dabOutput')
| -rw-r--r-- | src/dabOutput/edi/AFPacket.cpp | 1 | ||||
| -rw-r--r-- | src/dabOutput/edi/PFT.cpp | 15 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/dabOutput/edi/AFPacket.cpp b/src/dabOutput/edi/AFPacket.cpp index cf83078..ae2bdd6 100644 --- a/src/dabOutput/edi/AFPacket.cpp +++ b/src/dabOutput/edi/AFPacket.cpp @@ -72,7 +72,6 @@ AFPacket AFPacketiser::Assemble(TagPacket tag_packet) uint16_t crc = 0xffff; crc = crc16(crc, &(packet.front()), packet.size()); crc ^= 0xffff; - crc = htons(crc); fprintf(stderr, " AFPacket crc %x\n", crc); diff --git a/src/dabOutput/edi/PFT.cpp b/src/dabOutput/edi/PFT.cpp index ffefaeb..ac53f5d 100644 --- a/src/dabOutput/edi/PFT.cpp +++ b/src/dabOutput/edi/PFT.cpp @@ -88,6 +88,9 @@ vector< vector<uint8_t> > PFT::ProtectAndFragment(AFPacket af_packet) const size_t fragment_size = m_num_chunks * (m_k + ParityBytes) / max_payload_size; const size_t num_fragments = m_num_chunks * (m_k + ParityBytes) / fragment_size; + fprintf(stderr, " PnF fragment_size %zu, num frag %zu\n", + fragment_size, num_fragments); + vector< vector<uint8_t> > fragments(num_fragments); for (size_t i = 0; i < num_fragments; i++) { @@ -119,7 +122,6 @@ std::vector< PFTFragment > PFT::Assemble(AFPacket af_packet) packet.push_back(m_pseq >> 8); packet.push_back(m_pseq & 0xFF); - m_pseq++; packet.push_back(findex >> 16); packet.push_back(findex >> 8); @@ -133,9 +135,8 @@ std::vector< PFTFragment > PFT::Assemble(AFPacket af_packet) unsigned int plen = fragment.size(); plen |= 0x8000; // Set FEC bit - packet.push_back(plen >> 16); - packet.push_back(plen >> 8); - packet.push_back(plen & 0xFF); + packet.push_back(plen >> 8); // RSk + packet.push_back(plen & 0xFF); // RSz packet.push_back(m_k); packet.push_back(zero_pad); @@ -144,7 +145,6 @@ std::vector< PFTFragment > PFT::Assemble(AFPacket af_packet) uint16_t crc = 0xffff; crc = crc16(crc, &(packet.front()), packet.size()); crc ^= 0xffff; - crc = htons(crc); packet.push_back((crc >> 8) & 0xFF); packet.push_back(crc & 0xFF); @@ -153,8 +153,13 @@ std::vector< PFTFragment > PFT::Assemble(AFPacket af_packet) packet.insert(packet.end(), fragment.begin(), fragment.end()); pft_fragments.push_back(packet); + + fprintf(stderr, "* PFT pseq %d, findex %d, fcount %d, plen %d\n", + m_pseq, findex, fcount, plen & ~0x8000); } + m_pseq++; + return pft_fragments; } |