Changeset 8687
- Timestamp:
- 06/06/13 23:10:39 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-dvbapi.c
r8682 r8687 977 977 if(i<0) i=0; 978 978 get_servicename(dvbapi_client, demux[demux_id].program_number, demux[demux_id].ECMpidcount>0 ? demux[demux_id].ECMpids[i].CAID : 0, channame); 979 cs_ log("[DVBAPI] Demuxer #%d stop descrambling program number %04X (%s)", demux_id, demux[demux_id].program_number, channame);979 cs_debug_mask(D_DVBAPI, "[DVBAPI] Demuxer #%d stop descrambling program number %04X (%s)", demux_id, demux[demux_id].program_number, channame); 980 980 dvbapi_stop_filter(demux_id, TYPE_EMM); 981 981 if (demux[demux_id].ECMpidcount>0){ … … 1375 1375 demux[demux_index].max_emm_filter = MAX_FILTER-1; 1376 1376 demux[demux_index].max_status = 1; 1377 cs_ log("[DVBAPI] Found channel in cache, start descrambling pid %d ", found);1377 cs_debug_mask(D_DVBAPI, "[DVBAPI] Found channel in cache, start descrambling pid %d ", found); 1378 1378 return; 1379 1379 } … … 1405 1405 if (!dvbapi_priority) cs_debug_mask(D_DVBAPI,"[DVBAPI] No oscam.dvbapi found or no valid rules are parsed!"); 1406 1406 1407 if (dvbapi_priority) { 1408 cs_log("[DVBAPI] oscam.dvbapi found applying valid parsed rules!"); 1409 1407 if (dvbapi_priority) { 1410 1408 struct s_reader *rdr; 1411 1409 ECM_REQUEST *er; … … 1516 1514 1517 1515 if (!matching_done) { //works if there is no oscam.dvbapi or if there is oscam.dvbapi but not p rules in it 1518 if (dvbapi_priority && !matching_done) cs_log("[DVBAPI] Demuxer #%d no prio rules in oscam.dvbapi matches!", demux_index);1519 if (!matching_done) cs_log("[DVBAPI] Demuxer #%d no valid rules in oscam.dvbapi present!", demux_index);1516 if (dvbapi_priority && !matching_done) 1517 cs_debug_mask(D_DVBAPI,"[DVBAPI] Demuxer #%d no prio rules in oscam.dvbapi matches!", demux_index); 1520 1518 1521 1519 struct s_reader *rdr; … … 1723 1721 1724 1722 for (n=0; n<demux[demux_id].ECMpidcount; n++) { 1725 cs_debug_mask(D_ TRACE,"[DVBAPI] Demuxer #%d PID #%d checked = %d status = %d (searching for pid with status = %d)", demux_id, n,1723 cs_debug_mask(D_DVBAPI,"[DVBAPI] Demuxer #%d PID #%d checked = %d status = %d (searching for pid with status = %d)", demux_id, n, 1726 1724 demux[demux_id].ECMpids[n].checked, demux[demux_id].ECMpids[n].status, j); 1727 1725 if (demux[demux_id].ECMpids[n].checked == 0 && demux[demux_id].ECMpids[n].status == j) { … … 2721 2719 if (demux[i].demux_fd[g].type == TYPE_EMM) emmcounter++; // count emm filters also 2722 2720 } 2723 cs_debug_mask(D_ TRACE,"[DVBAPI] Demuxer #%d has %d ecmpids, %d streampids, %d ecmfilters and %d emmfilters", i, demux[i].ECMpidcount,2721 cs_debug_mask(D_DVBAPI,"[DVBAPI] Demuxer #%d has %d ecmpids, %d streampids, %d ecmfilters and %d emmfilters", i, demux[i].ECMpidcount, 2724 2722 demux[i].STREAMpidcount, ecmcounter, emmcounter); 2725 2723 //early start for irdeto since they need emm before ecm (pmt emmstart = 1 if detected caid 0x06) … … 2979 2977 if (j==demux[i].ECMpidcount) continue; 2980 2978 2981 cs_ log("[DVBAPI] Demuxer #%d %scontrolword received for PID #%d CAID %04X PROVID %06X ECMPID %04X", i,2979 cs_debug_mask(D_DVBAPI,"[DVBAPI] Demuxer #%d %scontrolword received for PID #%d CAID %04X PROVID %06X ECMPID %04X", i, 2982 2980 (er->rc >= E_NOTFOUND?"no ":""), j, er->caid, er->prid, er->pid); 2983 2981 … … 2995 2993 char ecmd5[17*3]; 2996 2994 cs_hexdump(0, er->ecmd5, 16, ecmd5, sizeof(ecmd5)); 2997 cs_ log("[DVBAPI] Demuxer #%d not interested in cw response on ecm hash %s", i, ecmd5);2995 cs_debug_mask(D_DVBAPI,"[DVBAPI] Demuxer #%d not interested in cw response on ecm hash %s", i, ecmd5); 2998 2996 return; 2999 2997 } … … 3003 3001 demux[i].curindex = j; 3004 3002 demux[i].ECMpids[j].checked = 2; 3005 cs_ log("[DVBAPI] Demuxer #%d descrambling PID #%d CAID: %04X ECMPID: %04X PROVID: %06X CHID: %02X", i, demux[i].curindex,3003 cs_debug_mask(D_DVBAPI,"[DVBAPI] Demuxer #%d descrambling PID #%d CAID: %04X ECMPID: %04X PROVID: %06X CHID: %02X", i, demux[i].curindex, 3006 3004 demux[i].ECMpids[j].CAID, demux[i].ECMpids[j].ECM_PID, demux[i].ECMpids[j].PROVID, demux[i].ECMpids[j].irdeto_curchid); 3007 3005 } … … 3032 3030 } 3033 3031 3034 cs_ log("[DVBAPI] Demuxer #%d descrambling PID #%d CAID: %04X ECMPID: %04X PROVID: %06X CHID: %02X", i, demux[i].curindex,3032 cs_debug_mask(D_DVBAPI,"[DVBAPI] Demuxer #%d descrambling PID #%d CAID: %04X ECMPID: %04X PROVID: %06X CHID: %02X", i, demux[i].curindex, 3035 3033 demux[i].ECMpids[j].CAID, demux[i].ECMpids[j].ECM_PID, demux[i].ECMpids[j].PROVID, demux[i].ECMpids[j].irdeto_curchid); 3036 3034 } … … 3041 3039 demux[i].ECMpids[j].irdeto_curchid++; 3042 3040 demux[i].ECMpids[j].table=0; 3043 cs_ log("[DVBAPI] Demuxer #%d trying next irdeto chid of PID #%d CAID: %04X ECMPID: %04X PROVID: %06X CHID: %02X", i, demux[i].curindex,3041 cs_debug_mask(D_DVBAPI,"[DVBAPI] Demuxer #%d trying next irdeto chid of PID #%d CAID: %04X ECMPID: %04X PROVID: %06X CHID: %02X", i, demux[i].curindex, 3044 3042 demux[i].ECMpids[j].CAID, demux[i].ECMpids[j].ECM_PID, demux[i].ECMpids[j].PROVID, demux[i].ECMpids[j].irdeto_curchid); 3045 3043 dvbapi_set_section_filter(i, er);
Note:
See TracChangeset
for help on using the changeset viewer.