diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-01-29 15:55:17 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-01-29 15:55:17 +0100 |
| commit | 4acf7a34c202293884739b40af699943d7e8e9d9 (patch) | |
| tree | 1f6b2d0a8c3646723c7785aa1f3fad25b7aadc1f /src/utils.cpp | |
| parent | 2346b17f650e56f70046e95a54f356a8e3e29107 (diff) | |
| download | dabmux-4acf7a34c202293884739b40af699943d7e8e9d9.tar.gz dabmux-4acf7a34c202293884739b40af699943d7e8e9d9.tar.bz2 dabmux-4acf7a34c202293884739b40af699943d7e8e9d9.zip | |
Add partial FIG2 label support
Add support for Ensemble label, programme services and components,
although the implementation for the component label is not properly
tested. (data services still to be done)
Neither short labels nor UCS-2 are not yet implemented.
Also, support for draftETSI TS 103 176 which redefines the meaning of
Rfa is still pending.
Diffstat (limited to 'src/utils.cpp')
| -rw-r--r-- | src/utils.cpp | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/utils.cpp b/src/utils.cpp index 7a922fe..02595b7 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -211,12 +211,11 @@ void printServices(const vector<shared_ptr<DabService> >& services) for (auto service : services) { etiLog.level(info) << "Service " << service->get_rc_name(); - etiLog.level(info) << " label: " << - service->label.long_label(); - etiLog.level(info) << " short label: " << - service->label.short_label(); - + etiLog.level(info) << " label: " << service->label.long_label(); + etiLog.level(info) << " short label: " << service->label.short_label(); etiLog.log(info, " (0x%x)", service->label.flag()); + etiLog.level(info) << " FIG2 label: " << service->label.fig2_label(); + etiLog.log(info, " id: 0x%lx (%lu)", service->id, service->id); @@ -244,7 +243,7 @@ void printComponents(const vec_sp_component& components) unsigned int index = 0; for (const auto component : components) { - etiLog.level(info) << "Component " << component->get_rc_name(); + etiLog.level(info) << "Component " << component->get_rc_name(); printComponent(component); ++index; } @@ -256,12 +255,11 @@ void printComponent(const shared_ptr<DabComponent>& component) component->serviceId, component->serviceId); etiLog.log(info, " subchannel id: 0x%x (%u)", component->subchId, component->subchId); - etiLog.level(info) << " label: " << - component->label.long_label(); - etiLog.level(info) << " short label: " << - component->label.short_label(); - + etiLog.level(info) << " label: " << component->label.long_label(); + etiLog.level(info) << " short label: " << component->label.short_label(); etiLog.log(info, " (0x%x)", component->label.flag()); + etiLog.level(info) << " FIG2 label: " << component->label.fig2_label(); + etiLog.log(info, " service component type: 0x%x (%u)", component->type, component->type); @@ -513,12 +511,11 @@ void printEnsemble(const shared_ptr<dabEnsemble>& ensemble) etiLog.log(info, "Ensemble"); etiLog.log(info, " id: 0x%lx (%lu)", ensemble->id, ensemble->id); etiLog.log(info, " ecc: 0x%x (%u)", ensemble->ecc, ensemble->ecc); - etiLog.level(info) << " label: " << - ensemble->label.long_label(); - etiLog.level(info) << " short label: " << - ensemble->label.short_label(); - + etiLog.level(info) << " label: " << ensemble->label.long_label(); + etiLog.level(info) << " short label: " << ensemble->label.short_label(); etiLog.log(info, " (0x%x)", ensemble->label.flag()); + etiLog.level(info) << " FIG2 label: " << ensemble->label.fig2_label(); + switch (ensemble->transmission_mode) { case TransmissionMode_e::TM_I: etiLog.log(info, " mode: TM I"); |