diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-07-30 22:29:16 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-07-30 22:29:16 +0200 |
| commit | aa84bda648f5b74625e3a54ea98788f49481beba (patch) | |
| tree | 00b6b8dfd7c3290083cda709aa1185f917e121d0 | |
| parent | 87b558071e9d3700116d14594a1207c91648cfb1 (diff) | |
| parent | b4823b1e44c42e137f85202621b07d01ccde111b (diff) | |
| download | dabmux-aa84bda648f5b74625e3a54ea98788f49481beba.tar.gz dabmux-aa84bda648f5b74625e3a54ea98788f49481beba.tar.bz2 dabmux-aa84bda648f5b74625e3a54ea98788f49481beba.zip | |
Merge remote-tracking branch 'basicmaster/next' into next
| -rw-r--r-- | src/DabMultiplexer.cpp | 5 | ||||
| -rw-r--r-- | src/DabMultiplexer.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/DabMultiplexer.cpp b/src/DabMultiplexer.cpp index db158da..e79d3fa 100644 --- a/src/DabMultiplexer.cpp +++ b/src/DabMultiplexer.cpp @@ -1385,8 +1385,8 @@ void DabMultiplexer::mux_frame(std::vector<boost::shared_ptr<DabOutput> >& outpu FIG0_13_app* app = (FIG0_13_app*)&etiFrame[index]; app->setType((*componentFIG0_13)->audio.uaType); - app->length = 4; - app->xpad = htonl(0x0cbc0000); + app->length = 2; + app->xpad = htons(0x0c3c); /* xpad meaning CA = 0 CAOrg = 0 @@ -1395,7 +1395,6 @@ void DabMultiplexer::mux_frame(std::vector<boost::shared_ptr<DabOutput> >& outpu DG = 0 (MSC data groups used) Rfu = 0 DSCTy(6) = 60 (MOT) - CAOrg(16) = 0 */ index += 2 + app->length; diff --git a/src/DabMultiplexer.h b/src/DabMultiplexer.h index 44e9bdb..de05b6c 100644 --- a/src/DabMultiplexer.h +++ b/src/DabMultiplexer.h @@ -435,7 +435,7 @@ struct FIG0_13_app { typeHigh = type >> 3; typeLow = type & 0x1f; } - uint32_t xpad; + uint16_t xpad; } PACKED; #define FIG0_13_APPTYPE_SLIDESHOW 0x2 |