Changeset 11050
- Timestamp:
- 10/10/15 15:27:59 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-dvbapi.c
r11035 r11050 1314 1314 } 1315 1315 1316 void dvbapi_add_ecmpid_int(int32_t demux_id, uint16_t caid, uint16_t ecmpid, uint32_t provid )1316 void dvbapi_add_ecmpid_int(int32_t demux_id, uint16_t caid, uint16_t ecmpid, uint32_t provid, char *txt) 1317 1317 { 1318 1318 int32_t n, added = 0; … … 1359 1359 demux[demux_id].ECMpids[demux[demux_id].ECMpidcount].table = 0; 1360 1360 1361 cs_log("Demuxer %d ecmpid %d CAID: %04X ECM_PID: %04X PROVID: %06X ", demux_id, demux[demux_id].ECMpidcount, caid, ecmpid, provid);1361 cs_log("Demuxer %d ecmpid %d CAID: %04X ECM_PID: %04X PROVID: %06X %s", demux_id, demux[demux_id].ECMpidcount, caid, ecmpid, provid, txt); 1362 1362 if(caid_is_irdeto(caid)) { demux[demux_id].emmstart.time = 1; } // marker to fetch emms early irdeto needs them! 1363 1363 … … 1365 1365 } 1366 1366 1367 void dvbapi_add_ecmpid(int32_t demux_id, uint16_t caid, uint16_t ecmpid, uint32_t provid )1368 { 1369 dvbapi_add_ecmpid_int(demux_id, caid, ecmpid, provid );1367 void dvbapi_add_ecmpid(int32_t demux_id, uint16_t caid, uint16_t ecmpid, uint32_t provid, char *txt) 1368 { 1369 dvbapi_add_ecmpid_int(demux_id, caid, ecmpid, provid, txt); 1370 1370 struct s_dvbapi_priority *joinentry; 1371 1371 … … 1380 1380 cs_log_dbg(D_DVBAPI, "Join ecmpid %04X@%06X:%04X to %04X@%06X:%04X", 1381 1381 caid, provid, ecmpid, joinentry->mapcaid, joinentry->mapprovid, joinentry->mapecmpid); 1382 dvbapi_add_ecmpid_int(demux_id, joinentry->mapcaid, joinentry->mapecmpid, joinentry->mapprovid );1382 dvbapi_add_ecmpid_int(demux_id, joinentry->mapcaid, joinentry->mapecmpid, joinentry->mapprovid, txt); 1383 1383 } 1384 1384 } … … 2592 2592 int32_t descriptor_ca_pid = b2i(2, buffer + j + 4)&0x1FFF; 2593 2593 int32_t descriptor_ca_provider = 0; 2594 char txt[(2*8) + 1 + 10 + 1 + 10]; // PBM: room for 8 byte pbm and DATE: date 2595 memset(txt, 0x00, sizeof(txt)); 2594 2596 2595 2597 if(descriptor_ca_system_id >> 8 == 0x01) … … 2599 2601 descriptor_ca_pid = b2i(2, buffer + j + u + 2)&0x1FFF; 2600 2602 descriptor_ca_provider = b2i(2, buffer + j + u + 4); 2601 dvbapi_add_ecmpid(demux_id, descriptor_ca_system_id, descriptor_ca_pid, descriptor_ca_provider); 2603 int8_t year = buffer[j + u + 15] >> 1; 2604 int8_t month = (((buffer[j + u + 15]&0x01) << 3) | (buffer[j + u + 16] >> 5)); 2605 int8_t day = buffer[j + u + 16]&0x1F; 2606 snprintf(txt, sizeof(txt), "PBM: "); 2607 cs_hexdump(0, buffer + j + u + 7, 8, txt+5, (2*8)+1); // hexdump 8 byte pbm 2608 snprintf(txt+20, sizeof(txt)-16, " DATE: %d-%d-%d", day, month, year+1990); 2609 dvbapi_add_ecmpid(demux_id, descriptor_ca_system_id, descriptor_ca_pid, descriptor_ca_provider, txt); 2602 2610 } 2603 2611 } … … 2613 2621 { descriptor_ca_provider = buffer[j + 6]; } 2614 2622 2615 dvbapi_add_ecmpid(demux_id, descriptor_ca_system_id, descriptor_ca_pid, descriptor_ca_provider );2623 dvbapi_add_ecmpid(demux_id, descriptor_ca_system_id, descriptor_ca_pid, descriptor_ca_provider, txt); 2616 2624 2617 2625 } … … 2966 2974 cs_log_dbg(D_DVBAPI, "Demuxer %d fake ecmpid %04X@%06X:%04x for unencrypted stream on srvid %04X", demux_id, addentry->mapcaid, addentry->mapprovid, 2967 2975 addentry->mapecmpid, demux[demux_id].program_number); 2968 dvbapi_add_ecmpid(demux_id, addentry->mapcaid, addentry->mapecmpid, addentry->mapprovid );2976 dvbapi_add_ecmpid(demux_id, addentry->mapcaid, addentry->mapecmpid, addentry->mapprovid, " (fake ecmpid)"); 2969 2977 break; 2970 2978 }
Note:
See TracChangeset
for help on using the changeset viewer.