diff options
Diffstat (limited to 'etisnoop.cpp')
| -rw-r--r-- | etisnoop.cpp | 116 |
1 files changed, 3 insertions, 113 deletions
diff --git a/etisnoop.cpp b/etisnoop.cpp index 09f8280..078a245 100644 --- a/etisnoop.cpp +++ b/etisnoop.cpp @@ -694,121 +694,11 @@ void decodeFIG(FIGalyser &figs, case 1: {// SHORT LABELS - uint16_t ext,oe,charset; - uint16_t flag; - char label[17]; + fig1_common_t fig1(f, figlen); - charset = (f[0] & 0xF0) >> 4; - oe = (f[0] & 0x08) >> 3; - ext = f[0] & 0x07; - sprintf(desc, - "FIG %d/%d: OE=%d, Charset=%d", - figtype, ext, oe, charset); - - printbuf(desc, indent, f+1, figlen-1); - memcpy(label, f+figlen-18, 16); - label[16] = 0x00; - flag = f[figlen-2] * 256 + \ - f[figlen-1]; - - figs.push_back(figtype, ext, figlen); + figs.push_back(figtype, fig1.ext(), figlen); - switch (ext) { - case 0: // FIG 1/0 Ensemble label - { // ETSI EN 300 401 8.1.13 - uint16_t eid; - eid = f[1] * 256 + f[2]; - sprintf(desc, "Ensemble ID 0x%04X label: \"%s\", Short label mask: 0x%04X", eid, label, flag); - printinfo(desc, indent+1); - } - break; - - case 1: // FIG 1/1 Programme service label - { // ETSI EN 300 401 8.1.14.1 - uint16_t sid; - sid = f[1] * 256 + f[2]; - sprintf(desc, "Service ID 0x%X label: \"%s\", Short label mask: 0x%04X", sid, label, flag); - printinfo(desc, indent+1); - } - break; - - case 4: // FIG 1/4 Service component label - { // ETSI EN 300 401 8.1.14.3 - uint32_t sid; - uint8_t pd, SCIdS; - pd = (f[1] & 0x80) >> 7; - SCIdS = f[1] & 0x0F; - if (pd == 0) { - sid = f[2] * 256 + \ - f[3]; - } - else { - sid = f[2] * 256 * 256 * 256 + \ - f[3] * 256 * 256 + \ - f[4] * 256 + \ - f[5]; - } - sprintf(desc, - "Service ID 0x%X , Service Component ID 0x%04X Short, label: \"%s\", label mask: 0x%04X", - sid, SCIdS, label, flag); - printinfo(desc, indent+1); - } - break; - - case 5: // FIG 1/5 Data service label - { // ETSI EN 300 401 8.1.14.2 - uint32_t sid; - sid = f[1] * 256 * 256 * 256 + \ - f[2] * 256 * 256 + \ - f[3] * 256 + \ - f[4]; - - sprintf(desc, - "Service ID 0x%X label: \"%s\", Short label mask: 0x%04X", - sid, label, flag); - printinfo(desc, indent+1); - } - break; - - - case 6: // FIG 1/6 X-PAD user application label - { // ETSI EN 300 401 8.1.14.4 - uint32_t sid; - uint8_t pd, SCIdS, xpadapp; - string xpadappdesc; - - pd = (f[1] & 0x80) >> 7; - SCIdS = f[1] & 0x0F; - if (pd == 0) { - sid = f[2] * 256 + \ - f[3]; - xpadapp = f[4] & 0x1F; - } - else { - sid = f[2] * 256 * 256 * 256 + \ - f[3] * 256 * 256 + \ - f[4] * 256 + \ - f[5]; - xpadapp = f[6] & 0x1F; - } - - if (xpadapp == 2) { - xpadappdesc = "DLS"; - } - else if (xpadapp == 12) { - xpadappdesc = "MOT"; - } - else { - xpadappdesc = "?"; - } - - - sprintf(desc,"Service ID 0x%X , Service Component ID 0x%04X Short, X-PAD App %02X (%s), label: \"%s\", label mask: 0x%04X", - sid, SCIdS, xpadapp, xpadappdesc.c_str(), label, flag); - printbuf(desc,indent+1,NULL,0,""); - } - break; - } + fig1_select(fig1, indent); } break; case 2: |