From 76bd144a8bbedfceceeb9ad2975a3d3f9436e311 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Thu, 16 Aug 2018 09:50:00 +0200 Subject: FIG0/6: use service ECC if defined --- doc/servicelinking.mux | 2 ++ src/fig/FIG0_6.cpp | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/servicelinking.mux b/doc/servicelinking.mux index 3f3ea25..5706351 100644 --- a/doc/servicelinking.mux +++ b/doc/servicelinking.mux @@ -38,6 +38,8 @@ linking { ; Whether this linkage set affects only one country or several. Linkage sets that ; include AMSS or DRM services need to have this set to true. (default false) + ; Linkage sets whose key service has a different ECC than the ensemble ECC need to + ; set this to true. international false ; Every linkage set has to contain a service from the current ensemble (mandatory) diff --git a/src/fig/FIG0_6.cpp b/src/fig/FIG0_6.cpp index e540ebc..b7776f4 100644 --- a/src/fig/FIG0_6.cpp +++ b/src/fig/FIG0_6.cpp @@ -3,7 +3,7 @@ 2011, 2012 Her Majesty the Queen in Right of Canada (Communications Research Center Canada) - Copyright (C) 2016 + Copyright (C) 2018 Matthias P. Braendli, matthias.braendli@mpb.li */ /* @@ -185,7 +185,8 @@ FillStatus FIG0_6::fill(uint8_t *buf, size_t max_size) } } else if (not PD and ILS) { - buf[0] = ensemble->ecc; + buf[0] = ((*keyservice)->ecc == 0) ? + ensemble->ecc : (*keyservice)->ecc; buf[1] = (*keyservice)->id >> 8; buf[2] = (*keyservice)->id & 0xFF; fig0->Length += 3; -- cgit v1.2.3