From 4bb4c9300fc8a1281b4c5a56f18e6b251239dcd1 Mon Sep 17 00:00:00 2001 From: Mathias Kuntze Date: Fri, 6 Mar 2020 10:23:58 +0100 Subject: add FIG 0/7 --- src/ConfigParser.cpp | 3 +- src/MuxElements.h | 1 + src/fig/FIG0.h | 3 +- src/fig/FIG0_7.cpp | 74 +++++++++++++++++++++++++++++++++++++++++++++++++ src/fig/FIG0_7.h | 51 ++++++++++++++++++++++++++++++++++ src/fig/FIGCarousel.cpp | 4 ++- src/fig/FIGCarousel.h | 2 +- 7 files changed, 134 insertions(+), 4 deletions(-) create mode 100644 src/fig/FIG0_7.cpp create mode 100644 src/fig/FIG0_7.h (limited to 'src') diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp index 776ddc8..6e50952 100644 --- a/src/ConfigParser.cpp +++ b/src/ConfigParser.cpp @@ -3,7 +3,7 @@ 2011, 2012 Her Majesty the Queen in Right of Canada (Communications Research Center Canada) - Copyright (C) 2018 + Copyright (C) 2020 Matthias P. Braendli, matthias.braendli@mpb.li http://www.opendigitalradio.org @@ -420,6 +420,7 @@ static void parse_general(ptree& pt, } ensemble->international_table = pt_ensemble.get("international-table", 1); + ensemble->reconfig_counter = pt_ensemble.get("reconfig-counter", 0); string lto_auto = pt_ensemble.get("local-time-offset", ""); if (lto_auto == "auto") { diff --git a/src/MuxElements.h b/src/MuxElements.h index 0f7e621..d1f4441 100644 --- a/src/MuxElements.h +++ b/src/MuxElements.h @@ -291,6 +291,7 @@ class dabEnsemble : public RemoteControllable { // 1 corresponds to the PTy used in RDS // 2 corresponds to program types used in north america int international_table = 1; + int reconfig_counter = 1; vec_sp_service services; vec_sp_component components; diff --git a/src/fig/FIG0.h b/src/fig/FIG0.h index 856b5ee..0076cf4 100644 --- a/src/fig/FIG0.h +++ b/src/fig/FIG0.h @@ -3,7 +3,7 @@ 2011, 2012 Her Majesty the Queen in Right of Canada (Communications Research Center Canada) - Copyright (C) 2017 + Copyright (C) 2020 Matthias P. Braendli, matthias.braendli@mpb.li */ /* @@ -32,6 +32,7 @@ #include "fig/FIG0_3.h" #include "fig/FIG0_5.h" #include "fig/FIG0_6.h" +#include "fig/FIG0_7.h" #include "fig/FIG0_8.h" #include "fig/FIG0_9.h" #include "fig/FIG0_10.h" diff --git a/src/fig/FIG0_7.cpp b/src/fig/FIG0_7.cpp new file mode 100644 index 0000000..e6df66b --- /dev/null +++ b/src/fig/FIG0_7.cpp @@ -0,0 +1,74 @@ +/* + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, + 2011, 2012 Her Majesty the Queen in Right of Canada (Communications + Research Center Canada) + + Copyright (C) 2020 + Matthias P. Braendli, matthias.braendli@mpb.li + Mathias Kuntze, mathias@kuntze.email + */ +/* + This file is part of ODR-DabMux. + + ODR-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. + + ODR-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 ODR-DabMux. If not, see . +*/ + +#include "fig/FIG0structs.h" +#include "fig/FIG0_7.h" +#include "utils.h" + +namespace FIC { + +struct FIGtype0_7 { + uint8_t Length:5; + uint8_t FIGtypeNumber:3; + uint8_t Extension:5; + uint8_t PD:1; + uint8_t OE:1; + uint8_t CN:1; + + uint8_t ReconfigCounter_high:2; + uint8_t ServiceCount:6; + uint8_t ReconfigCounter_low:8; +} PACKED; + +//=========== FIG 0/0 =========== + +FillStatus FIG0_7::fill(uint8_t *buf, size_t max_size) +{ + FillStatus fs; + + FIGtype0_7 *fig0_7; + fig0_7 = (FIGtype0_7 *)buf; + + fig0_7->FIGtypeNumber = 0; + fig0_7->Length = 3; + fig0_7->CN = 0; + fig0_7->OE = 0; + fig0_7->PD = 0; + fig0_7->Extension = 7; + + auto ensemble = m_rti->ensemble; + + fig0_7->ServiceCount = ensemble->services.size(); + fig0_7->ReconfigCounter_high = (ensemble->reconfig_counter % 1024) / 256; + fig0_7->ReconfigCounter_low = (ensemble->reconfig_counter % 1024) % 256; + + fs.complete_fig_transmitted = true; + fs.num_bytes_written = 4; + return fs; +} + +} + diff --git a/src/fig/FIG0_7.h b/src/fig/FIG0_7.h new file mode 100644 index 0000000..30de3dc --- /dev/null +++ b/src/fig/FIG0_7.h @@ -0,0 +1,51 @@ +/* + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, + 2011, 2012 Her Majesty the Queen in Right of Canada (Communications + Research Center Canada) + + Copyright (C) 2020 + Matthias P. Braendli, matthias.braendli@mpb.li + Mathisd Kuntze, mathias@kuntze.email + */ +/* + This file is part of ODR-DabMux. + + ODR-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. + + ODR-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 ODR-DabMux. If not, see . +*/ + +#pragma once + +#include +#include + +namespace FIC { + +// FIG type 0/7, Configuration Info (MCI), +// Service Number information +class FIG0_7 : public IFIG +{ + public: + FIG0_7(FIGRuntimeInformation* rti) : + m_rti(rti) {} + virtual FillStatus fill(uint8_t *buf, size_t max_size); + virtual FIG_rate repetition_rate() const { return FIG_rate::FIG0_0; } + + virtual int figtype() const { return 0; } + virtual int figextension() const { return 7; } + + private: + FIGRuntimeInformation *m_rti; +}; + +} diff --git a/src/fig/FIGCarousel.cpp b/src/fig/FIGCarousel.cpp index 8ea183c..bb5e79b 100644 --- a/src/fig/FIGCarousel.cpp +++ b/src/fig/FIGCarousel.cpp @@ -3,7 +3,7 @@ 2011, 2012 Her Majesty the Queen in Right of Canada (Communications Research Center Canada) - Copyright (C) 2017 + Copyright (C) 2020 Matthias P. Braendli, matthias.braendli@mpb.li Implementation of the FIG carousel to schedule the FIGs into the @@ -82,6 +82,7 @@ FIGCarousel::FIGCarousel(std::shared_ptr ensemble) : m_fig0_3(&m_rti), m_fig0_5(&m_rti), m_fig0_6(&m_rti), + m_fig0_7(&m_rti), m_fig0_17(&m_rti), m_fig0_8(&m_rti), m_fig1_0(&m_rti), @@ -114,6 +115,7 @@ FIGCarousel::FIGCarousel(std::shared_ptr ensemble) : * FIG 0/7 have a defined location in the FIC. */ load_and_allocate(m_fig0_0, FIBAllocation::FIB0); + load_and_allocate(m_fig0_7, FIBAllocation::FIB0); load_and_allocate(m_fig0_1, FIBAllocation::FIB_ANY); load_and_allocate(m_fig0_2, FIBAllocation::FIB_ANY); load_and_allocate(m_fig0_3, FIBAllocation::FIB_ANY); diff --git a/src/fig/FIGCarousel.h b/src/fig/FIGCarousel.h index a07a855..bdb9481 100644 --- a/src/fig/FIGCarousel.h +++ b/src/fig/FIGCarousel.h @@ -3,7 +3,7 @@ 2011, 2012 Her Majesty the Queen in Right of Canada (Communications Research Center Canada) - Copyright (C) 2017 + Copyright (C) 2020 Matthias P. Braendli, matthias.braendli@mpb.li Implementation of the FIG carousel to schedule the FIGs into the -- cgit v1.2.3 From 34db5f02dd472857de2fd810a3ff8a8f83f407fb Mon Sep 17 00:00:00 2001 From: Mathias Kuntze Date: Fri, 6 Mar 2020 11:24:36 +0100 Subject: fixed FIG 0/7 dependency --- Makefile.am | 2 ++ src/fig/FIGCarousel.h | 1 + 2 files changed, 3 insertions(+) (limited to 'src') diff --git a/Makefile.am b/Makefile.am index 7a56d93..2b05651 100644 --- a/Makefile.am +++ b/Makefile.am @@ -108,6 +108,8 @@ odr_dabmux_SOURCES =src/DabMux.cpp \ src/fig/FIG0_5.h \ src/fig/FIG0_6.cpp \ src/fig/FIG0_6.h \ + src/fig/FIG0_7.cpp \ + src/fig/FIG0_7.h \ src/fig/FIG0_8.cpp \ src/fig/FIG0_8.h \ src/fig/FIG0_9.cpp \ diff --git a/src/fig/FIGCarousel.h b/src/fig/FIGCarousel.h index bdb9481..29ede3b 100644 --- a/src/fig/FIGCarousel.h +++ b/src/fig/FIGCarousel.h @@ -98,6 +98,7 @@ class FIGCarousel { FIG0_3 m_fig0_3; FIG0_5 m_fig0_5; FIG0_6 m_fig0_6; + FIG0_7 m_fig0_7; FIG0_17 m_fig0_17; FIG0_8 m_fig0_8; FIG1_0 m_fig1_0; -- cgit v1.2.3 From eb8c283cff3269f0cac45472d31a3fc6f78cefab Mon Sep 17 00:00:00 2001 From: Mathias Kuntze Date: Tue, 10 Mar 2020 10:14:14 +0100 Subject: add special FIG 0/7 handling to send directly after FIG 0/0 --- src/fig/FIGCarousel.cpp | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/fig/FIGCarousel.cpp b/src/fig/FIGCarousel.cpp index bb5e79b..162f0dd 100644 --- a/src/fig/FIGCarousel.cpp +++ b/src/fig/FIGCarousel.cpp @@ -272,7 +272,7 @@ size_t FIGCarousel::carousel( /* Take special care for FIG0/0 */ auto fig0_0 = find_if(sorted_figs.begin(), sorted_figs.end(), [](const FIGCarouselElement* f) { - return f->fig->repetition_rate() == FIG_rate::FIG0_0; + return (f->fig->figtype() == 0 && f->fig->figextension() == 0); }); if (fig0_0 != sorted_figs.end()) { @@ -316,6 +316,53 @@ size_t FIGCarousel::carousel( sorted_figs.erase(fig0_0); } + /* Take special care for FIG0/7 */ + auto fig0_7 = find_if(sorted_figs.begin(), sorted_figs.end(), + [](const FIGCarouselElement* f) { + return (f->fig->figtype() == 0 && f->fig->figextension() == 7); + }); + + if (fig0_7 != sorted_figs.end()) { + if (framephase == 0) { // TODO check for all TM + FillStatus status = (*fig0_7)->fig->fill(pbuf, available_size); + size_t written = status.num_bytes_written; + + if (written > 0) { + available_size -= written; + pbuf += written; + +#if CAROUSELDEBUG + if (written) { + std::cerr << " ****** FIG0/7(special) wrote\t" << written << " bytes" + << std::endl; + } + + if ( (*fig0_7)->fig->figtype() != 0 or + (*fig0_7)->fig->figextension() != 7 or + written != 4) { + + std::stringstream ss; + ss << "Assertion error: FIG 0/7 is actually " << + (*fig0_7)->fig->figtype() + << "/" << (*fig0_7)->fig->figextension() << + " and wrote " << written << " bytes"; + + throw std::runtime_error(ss.str()); + } +#endif + } + else { + throw std::runtime_error("Failed to write FIG0/7"); + } + + if (status.complete_fig_transmitted) { + (*fig0_7)->increase_deadline(); + } + } + + sorted_figs.erase(fig0_7); + } + /* Fill the FIB with the FIGs, taking the earliest deadline first */ while (available_size > 0 and not sorted_figs.empty()) { -- cgit v1.2.3