aboutsummaryrefslogtreecommitdiffstats
path: root/src/fig
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2015-08-07 11:58:48 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2015-08-07 11:58:48 +0200
commite601ed83c8acbb0160b0d75ce0dd09852fb10fdf (patch)
treeeaf37a0313c836e057b86ec87b1e8d8f438214c8 /src/fig
parent342f9fa6167359ff6bf030887f96ca4c0a642086 (diff)
downloaddabmux-e601ed83c8acbb0160b0d75ce0dd09852fb10fdf.tar.gz
dabmux-e601ed83c8acbb0160b0d75ce0dd09852fb10fdf.tar.bz2
dabmux-e601ed83c8acbb0160b0d75ce0dd09852fb10fdf.zip
Add FIG0/13
Diffstat (limited to 'src/fig')
-rw-r--r--src/fig/FIG0.cpp133
-rw-r--r--src/fig/FIG0.h26
2 files changed, 157 insertions, 2 deletions
diff --git a/src/fig/FIG0.cpp b/src/fig/FIG0.cpp
index eb571fc..a080da6 100644
--- a/src/fig/FIG0.cpp
+++ b/src/fig/FIG0.cpp
@@ -563,6 +563,139 @@ FillStatus FIG0_8::fill(uint8_t *buf, size_t max_size)
return fs;
}
+//=========== FIG 0/13 ===========
+
+FIG0_13::FIG0_13(FIGRuntimeInformation *rti) :
+ m_rti(rti),
+ m_initialised(false),
+ m_transmit_programme(false)
+{
+}
+
+FillStatus FIG0_13::fill(uint8_t *buf, size_t max_size)
+{
+ FillStatus fs;
+ auto ensemble = m_rti->ensemble;
+ ssize_t remaining = max_size;
+
+ if (not m_initialised) {
+ componentFIG0_13 = m_rti->ensemble->components.end();
+ }
+
+ FIGtype0* fig0 = NULL;
+
+ if (componentFIG0_13 == ensemble->components.end()) {
+ componentFIG0_13 = ensemble->components.begin();
+
+ // The full database is sent every second full loop
+ fs.complete_fig_transmitted = m_transmit_programme;
+
+ m_transmit_programme = not m_transmit_programme;
+ // Alternate between data and and programme FIG0/13,
+ // do not mix fig0 with PD=0 with extension 13 stuff
+ // that actually needs PD=1, and vice versa
+ }
+
+ for (; componentFIG0_13 != ensemble->components.end();
+ ++componentFIG0_13) {
+
+ auto subchannel = getSubchannel(ensemble->subchannels,
+ (*componentFIG0_13)->subchId);
+
+ if (subchannel == ensemble->subchannels.end()) {
+ etiLog.log(error,
+ "Subchannel %i does not exist for component "
+ "of service %i\n",
+ (*componentFIG0_13)->subchId,
+ (*componentFIG0_13)->serviceId);
+ throw MuxInitException();
+ }
+
+ if ( m_transmit_programme &&
+ (*subchannel)->type == Audio &&
+ (*componentFIG0_13)->audio.uaType != 0xffff) {
+ if (fig0 == NULL) {
+ fig0 = (FIGtype0*)buf;
+ fig0->FIGtypeNumber = 0;
+ fig0->Length = 1;
+ fig0->CN = 0;
+ fig0->OE = 0;
+ fig0->PD = 0;
+ fig0->Extension = 13;
+ buf += 2;
+ remaining -= 2;
+ }
+
+ if (remaining < 3+4+11) {
+ break;
+ }
+
+ FIG0_13_shortAppInfo* info = (FIG0_13_shortAppInfo*)buf;
+ info->SId = htonl((*componentFIG0_13)->serviceId) >> 16;
+ info->SCIdS = (*componentFIG0_13)->SCIdS;
+ info->No = 1;
+ buf += 3;
+ remaining -= 3;
+ fig0->Length += 3;
+
+ FIG0_13_app* app = (FIG0_13_app*)buf;
+ app->setType((*componentFIG0_13)->audio.uaType);
+ app->length = 2;
+ app->xpad = htons(0x0c3c);
+ /* xpad meaning
+ CA = 0
+ CAOrg = 0
+ Rfu = 0
+ AppTy(5) = 12 (MOT, start of X-PAD data group)
+ DG = 0 (MSC data groups used)
+ Rfu = 0
+ DSCTy(6) = 60 (MOT)
+ */
+
+ buf += 2 + app->length;
+ remaining -= 2 + app->length;
+ fig0->Length += 2 + app->length;
+ }
+ else if (!m_transmit_programme &&
+ (*subchannel)->type == Packet &&
+ (*componentFIG0_13)->packet.appType != 0xffff) {
+
+ if (fig0 == NULL) {
+ fig0 = (FIGtype0*)buf;
+ fig0->FIGtypeNumber = 0;
+ fig0->Length = 1;
+ fig0->CN = 0;
+ fig0->OE = 0;
+ fig0->PD = 1;
+ fig0->Extension = 13;
+ buf += 2;
+ remaining -= 2;
+ }
+
+ if (remaining < 5+2) {
+ break;
+ }
+
+ FIG0_13_longAppInfo* info = (FIG0_13_longAppInfo*)buf;
+ info->SId = htonl((*componentFIG0_13)->serviceId);
+ info->SCIdS = (*componentFIG0_13)->SCIdS;
+ info->No = 1;
+ buf += 5;
+ remaining -= 5;
+ fig0->Length += 5;
+
+ FIG0_13_app* app = (FIG0_13_app*)buf;
+ app->setType((*componentFIG0_13)->packet.appType);
+ app->length = 0;
+ buf += 2;
+ remaining -= 2;
+ fig0->Length += 2;
+ }
+ }
+
+ return fs;
+}
+
//=========== FIG 0/17 ===========
FIG0_17::FIG0_17(FIGRuntimeInformation *rti) :
diff --git a/src/fig/FIG0.h b/src/fig/FIG0.h
index 57ca317..06beb7e 100644
--- a/src/fig/FIG0.h
+++ b/src/fig/FIG0.h
@@ -102,8 +102,10 @@ class FIG0_3 : public IFIG
FIGRuntimeInformation *m_rti;
};
-// FIG type 0/8, MCI, Service Organization, one instance of
-// FIGtype0_8_Service for each subchannel
+// FIG type 0/8
+// The Extension 8 of FIG type 0 (FIG 0/8) provides information to link
+// together the service component description that is valid within the ensemble
+// to a service component description that is valid in other ensembles
class FIG0_8 : public IFIG
{
public:
@@ -120,6 +122,26 @@ class FIG0_8 : public IFIG
std::vector<DabComponent*>::iterator componentFIG0_8;
};
+// FIG type 0/13
+// User Application Information
+class FIG0_13 : public IFIG
+{
+ public:
+ FIG0_13(FIGRuntimeInformation* rti);
+ virtual FillStatus fill(uint8_t *buf, size_t max_size);
+ virtual FIG_rate repetition_rate(void) { return FIG_rate::B; }
+
+ virtual const int figtype(void) const { return 0; }
+ virtual const int figextension(void) const { return 13; }
+
+ private:
+ FIGRuntimeInformation *m_rti;
+ bool m_initialised;
+ bool m_transmit_programme;
+ std::vector<DabComponent*>::iterator componentFIG0_13;
+};
+
+
// FIG type 0/17
class FIG0_17 : public IFIG
{