diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-02-13 09:29:47 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-02-13 09:29:47 +0100 |
| commit | 8594e81beadc395b3fc2568dc29b48712acb2561 (patch) | |
| tree | b22d00fc01aa81a095b0664b3b947781a1064a49 /src/DabMultiplexer.cpp | |
| parent | c4833640f8dddbe556cc6d40211223a05d5270b8 (diff) | |
| parent | 7eb97a486a8a39ef3986b9c2c7c452e9ccf2693a (diff) | |
| download | dabmux-8594e81beadc395b3fc2568dc29b48712acb2561.tar.gz dabmux-8594e81beadc395b3fc2568dc29b48712acb2561.tar.bz2 dabmux-8594e81beadc395b3fc2568dc29b48712acb2561.zip | |
Merge KuntzeM's pull request fixing #35 into next
ETI with DAB (MUSICAM) and EEP_A protection level was not possible.
Diffstat (limited to 'src/DabMultiplexer.cpp')
| -rw-r--r-- | src/DabMultiplexer.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/DabMultiplexer.cpp b/src/DabMultiplexer.cpp index 5763c8a..f56a4ff 100644 --- a/src/DabMultiplexer.cpp +++ b/src/DabMultiplexer.cpp @@ -276,7 +276,7 @@ void DabMultiplexer::prepare_services_components() protection = &(*subchannel)->protection; switch ((*subchannel)->type) { - case subchannel_type_t::Audio: + case subchannel_type_t::DABPlusAudio: { if (protection->form == EEP) { /* According to ETSI TS 102 563 Clause 7.1 FIC signalling: @@ -291,6 +291,15 @@ void DabMultiplexer::prepare_services_components() } } break; + case subchannel_type_t::DABAudio: + { + if (protection->form == EEP) { + /* ASCTy change to 0x0, because DAB mp2 is using + */ + (*component)->type = 0x0; + } + } + break; case subchannel_type_t::DataDmb: case subchannel_type_t::Fidc: case subchannel_type_t::Packet: @@ -720,7 +729,7 @@ void DabMultiplexer::mux_frame(std::vector<std::shared_ptr<DabOutput> >& outputs edi_time += chrono::seconds(1); } - /********************************************************************** + /********************************************************************** *********** Section FRPD ***************************************** **********************************************************************/ @@ -748,7 +757,7 @@ void DabMultiplexer::mux_frame(std::vector<std::shared_ptr<DabOutput> >& outputs } #if HAVE_OUTPUT_EDI - /********************************************************************** + /********************************************************************** *********** Finalise and send EDI ******************************** **********************************************************************/ @@ -817,7 +826,7 @@ void DabMultiplexer::mux_frame(std::vector<std::shared_ptr<DabOutput> >& outputs #endif // HAVE_OUTPUT_EDI #if _DEBUG - /********************************************************************** + /********************************************************************** *********** Output a small message ********************************* **********************************************************************/ if (currentFrame % 100 == 0) { |