aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2013-11-22 19:12:30 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2014-05-20 21:39:36 +0200
commit05da854addac962e20ff9f1e7bdad3cbacb66905 (patch)
tree0e135fb84cdba7f8ee02606e09c97de99bb5ef16
parent417cd7e7ce8a75ed79dc01687428d172f590189d (diff)
downloaddabmux-05da854addac962e20ff9f1e7bdad3cbacb66905.tar.gz
dabmux-05da854addac962e20ff9f1e7bdad3cbacb66905.tar.bz2
dabmux-05da854addac962e20ff9f1e7bdad3cbacb66905.zip
Add AFPacket and a few TagItems
-rw-r--r--src/dabOutput/edi/AFPacket.cpp45
-rw-r--r--src/dabOutput/edi/AFPacket.h60
-rw-r--r--src/dabOutput/edi/TagItems.cpp132
-rw-r--r--src/dabOutput/edi/TagItems.h116
4 files changed, 353 insertions, 0 deletions
diff --git a/src/dabOutput/edi/AFPacket.cpp b/src/dabOutput/edi/AFPacket.cpp
new file mode 100644
index 0000000..f690b92
--- /dev/null
+++ b/src/dabOutput/edi/AFPacket.cpp
@@ -0,0 +1,45 @@
+/*
+ Copyright (C) 2013 Matthias P. Braendli
+ http://mpb.li
+
+ EDI output.
+ This implements an AF Packet as defined ETSI TS 102 821.
+ Also see ETSI TS 102 693
+
+ */
+/*
+ This file is part of CRC-DabMux.
+
+ CRC-DabMux is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ CRC-DabMux is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "config.h"
+#include "AFPacket.h"
+#include <vector>
+#include <string>
+#include <stdint.h>
+
+std::vector<uint8_t> AFPacket::Assemble()
+{
+ header.sync = 'A' << 8 | 'F';
+ header.seq = 0;
+ header.ar_cf = 0;
+ header.ar_maj = 1;
+ header.ar_min = 0;
+ header.pt = 'T';
+
+ std::string pack_data("Nothingyetpleasecomelater");
+ std::vector<uint8_t> packet(pack_data.begin(), pack_data.end());
+ return packet;
+}
+
diff --git a/src/dabOutput/edi/AFPacket.h b/src/dabOutput/edi/AFPacket.h
new file mode 100644
index 0000000..c4f33bf
--- /dev/null
+++ b/src/dabOutput/edi/AFPacket.h
@@ -0,0 +1,60 @@
+/*
+ Copyright (C) 2013 Matthias P. Braendli
+ http://mpb.li
+
+ EDI output.
+ This implements an AF Packet as defined ETSI TS 102 821.
+ Also see ETSI TS 102 693
+
+ */
+/*
+ This file is part of CRC-DabMux.
+
+ CRC-DabMux is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ CRC-DabMux is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _AFPACKET_H_
+#define _AFPACKET_H_
+
+#include "config.h"
+#include <vector>
+#include <stdint.h>
+#define PACKED __attribute__ ((packed))
+
+// ETSI TS 102 821, 6.1 AF packet structure
+struct AFHeader
+{
+ uint16_t sync;
+ uint32_t len;
+ uint16_t seq;
+ uint8_t ar_cf:1;
+ uint8_t ar_maj:3;
+ uint8_t ar_min:4;
+ uint8_t pt;
+} PACKED;
+
+class AFPacket
+{
+ public:
+ AFPacket();
+
+ std::vector<uint8_t> Assemble();
+
+ private:
+ AFHeader header;
+ std::vector<uint8_t> packet_;
+};
+
+#endif
+
diff --git a/src/dabOutput/edi/TagItems.cpp b/src/dabOutput/edi/TagItems.cpp
new file mode 100644
index 0000000..b83c1bf
--- /dev/null
+++ b/src/dabOutput/edi/TagItems.cpp
@@ -0,0 +1,132 @@
+/*
+ Copyright (C) 2013 Matthias P. Braendli
+ http://mpb.li
+
+ EDI output.
+ This defines a few TAG items as defined ETSI TS 102 821 and
+ ETSI TS 102 693
+
+ */
+/*
+ This file is part of CRC-DabMux.
+
+ CRC-DabMux is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ CRC-DabMux is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _AFPACKET_H_
+#define _AFPACKET_H_
+
+#include "config.h"
+#include "TagItems.h"
+#include <vector>
+#include <string>
+#include <stdint.h>
+
+std::vector<uint8_t> TagStarPTR::Assemble()
+{
+ std::string pack_data("*ptr\0\0\0\100DETI");
+ std::vector<uint8_t> packet(pack_data.begin(), pack_data.end());
+ return packet;
+}
+
+std::vector<uint8_t> TagDETI::Assemble()
+{
+ std::string pack_data("deti\0\0\0\0");
+ std::vector<uint8_t> packet(pack_data.begin(), pack_data.end());
+ packet.reserve(256);
+
+ uint16_t detiHeader = dflc | (rfudf << 13) | (ficf << 14) | (atstf << 15);
+ packet.push_back(detiHeader >> 8);
+ packet.push_back(detiHeader & 0xFF);
+
+ uint32_t etiHeader = mnsc | (rfu << 16) | (rfa << 17) |
+ (fp << 19) | (mid << 22) | (stat << 24);
+ packet.push_back((etiHeader >> 24) & 0xFF);
+ packet.push_back((etiHeader >> 16) & 0xFF);
+ packet.push_back((etiHeader >> 8) & 0xFF);
+ packet.push_back(etiHeader & 0xFF);
+
+ if (atstf) {
+ packet.push_back(utco);
+
+ packet.push_back((seconds >> 24) & 0xFF);
+ packet.push_back((seconds >> 16) & 0xFF);
+ packet.push_back((seconds >> 8) & 0xFF);
+ packet.push_back(seconds & 0xFF);
+
+ packet.push_back((tsta >> 16) & 0xFF);
+ packet.push_back((tsta >> 8) & 0xFF);
+ packet.push_back(tsta & 0xFF);
+ }
+
+ if (ficf) {
+ for (size_t i = 0; i < fic_length; i++) {
+ packet.push_back(fic_data[i]);
+ }
+ }
+
+ if (rfudf) {
+ packet.push_back((rfud >> 16) & 0xFF);
+ packet.push_back((rfud >> 8) & 0xFF);
+ packet.push_back(rfud & 0xFF);
+ }
+
+ // calculate and update size
+ // remove TAG name and TAG length fields and convert to bits
+ uint32_t taglength = (packet.size() - 8) * 8;
+
+ // write length into packet
+ packet[4] = (taglength >> 24) & 0xFF;
+ packet[5] = (taglength >> 16) & 0xFF;
+ packet[6] = (taglength >> 8) & 0xFF;
+ packet[7] = taglength & 0xFF;
+
+ dflc = (dflc+1) % 5000;
+
+ return packet;
+}
+
+
+std::vector<uint8_t> TagESTn::Assemble()
+{
+ std::string pack_data("estN\0\0\0\0");
+ std::vector<uint8_t> packet(pack_data.begin(), pack_data.end());
+
+ packet[3] = id_; // replace the N in estN above
+
+ packet.reserve(mst_length*8 + 16);
+
+ uint32_t sstc = (scid << 18) | (sad << 8) | (tpl << 2) | rfa;
+ packet.push_back((sstc >> 16) & 0xFF);
+ packet.push_back((sstc >> 8) & 0xFF);
+ packet.push_back(sstc & 0xFF);
+
+ for (size_t i = 0; i < mst_length; i++) {
+ packet.push_back(mst_data[i]);
+ }
+
+ // calculate and update size
+ // remove TAG name and TAG length fields and convert to bits
+ uint32_t taglength = (packet.size() - 8) * 8;
+
+ // write length into packet
+ packet[4] = (taglength >> 24) & 0xFF;
+ packet[5] = (taglength >> 16) & 0xFF;
+ packet[6] = (taglength >> 8) & 0xFF;
+ packet[7] = taglength & 0xFF;
+
+ return packet;
+}
+#endif
+
diff --git a/src/dabOutput/edi/TagItems.h b/src/dabOutput/edi/TagItems.h
new file mode 100644
index 0000000..c0e863a
--- /dev/null
+++ b/src/dabOutput/edi/TagItems.h
@@ -0,0 +1,116 @@
+/*
+ Copyright (C) 2013 Matthias P. Braendli
+ http://mpb.li
+
+ EDI output.
+ This defines a few TAG items as defined ETSI TS 102 821 and
+ ETSI TS 102 693
+
+ */
+/*
+ This file is part of CRC-DabMux.
+
+ CRC-DabMux is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ CRC-DabMux is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _TAGITEMS_H_
+#define _TAGITEMS_H_
+
+#include "config.h"
+#include "Eti.h"
+#include <vector>
+#include <string>
+#include <stdint.h>
+#define PACKED __attribute__ ((packed))
+
+class TagItem
+{
+ public:
+ virtual std::vector<uint8_t> Assemble() = 0;
+};
+
+// ETSI TS 102 693, 5.1.1 Protocol type and revision
+class TagStarPTR : public TagItem
+{
+ public:
+ std::vector<uint8_t> Assemble();
+};
+
+// ETSI TS 102 693, 5.1.3 DAB ETI(LI) Management (deti)
+class TagDETI : public TagItem
+{
+ public:
+ TagDETI()
+ {
+ // set optional fields to "not present"
+ atstf = 0;
+ rfudf = 0;
+ ficf = 0;
+
+ dflc = 0; // counter
+ }
+ std::vector<uint8_t> Assemble();
+
+ /***** DATA in intermediary format ****/
+ // For the ETI Header: must be defined !
+ uint8_t stat;
+ uint8_t mid;
+ uint8_t fp;
+ uint8_t rfa;
+ uint8_t rfu;
+ uint8_t mnsc;
+
+ // ATST (optional)
+ bool atstf; // presence of atst data
+ uint8_t utco;
+ uint32_t seconds;
+ uint32_t tsta;
+
+ // the FIC (optional)
+ bool ficf;
+ const char* fic_data;
+ size_t fic_length;
+
+ // rfu
+ bool rfudf;
+ uint32_t rfud;
+
+ private:
+ uint32_t dflc; //modulo 5000 counter for each eti frame
+
+};
+
+// ETSI TS 102 693, 5.1.5 ETI Sub-Channel Stream <n>
+class TagESTn : public TagItem
+{
+ public:
+ TagESTn(uint8_t id) : id_(id) {} ;
+
+ std::vector<uint8_t> Assemble();
+
+ // SSTCn
+ uint8_t scid;
+ uint8_t sad;
+ uint8_t tpl;
+ uint8_t rfa;
+
+ // Pointer to MSTn data
+ uint8_t* mst_data;
+ size_t mst_length; // STLn * 8 bytes
+
+ private:
+ uint8_t id_;
+};
+#endif
+