summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-09-23 16:50:31 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-09-23 16:50:31 +0200
commit27c6111ebf2e94af6e93c35879efd310861bb08e (patch)
tree0961e4f36553f056c0bbf825dece27444d166e79
parent234702919ee1129e40fec356db3f6a1c7c5db70a (diff)
downloaddabmux-27c6111ebf2e94af6e93c35879efd310861bb08e.tar.gz
dabmux-27c6111ebf2e94af6e93c35879efd310861bb08e.tar.bz2
dabmux-27c6111ebf2e94af6e93c35879efd310861bb08e.zip
Add warning about primary component labels
-rw-r--r--src/ConfigParser.cpp6
-rw-r--r--src/fig/FIG1.cpp3
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp
index 733b5df..6a359b7 100644
--- a/src/ConfigParser.cpp
+++ b/src/ConfigParser.cpp
@@ -507,6 +507,12 @@ void parse_ptree(boost::property_tree::ptree& pt,
abort();
}
+ if (component->SCIdS == 0 and not component->label.long_label().empty()) {
+ etiLog.level(warn) << "Primary component " << component->uid <<
+ " has label set. Since V2.1.1 of the specification, only secondary"
+ " components are allowed to have labels.";
+ }
+
if (figType != -1) {
if (figType >= (1<<12)) {
stringstream ss;
diff --git a/src/fig/FIG1.cpp b/src/fig/FIG1.cpp
index 86c717e..8f41239 100644
--- a/src/fig/FIG1.cpp
+++ b/src/fig/FIG1.cpp
@@ -145,6 +145,9 @@ FillStatus FIG1_4::fill(uint8_t *buf, size_t max_size)
auto service = getService(*component, ensemble->services);
+ /* We check in the config parser if the primary component has
+ * a label, which is forbidden since V2.1.1 */
+
if (not (*component)->label.long_label().empty() ) {
if ((*service)->getType(ensemble) == subchannel_type_t::Audio) {