Changeset 4904 for trunk/module-dvbapi.c
- Timestamp:
- 04/03/11 17:12:39 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-dvbapi.c
r4900 r4904 325 325 void dvbapi_start_emm_filter(int demux_index) { 326 326 int j; 327 char *typtext[]={"UNKNOWN", "UNIQUE", "SHARED", "GLOBAL"};328 327 329 328 if (demux[demux_index].pidindex==-1) return; … … 368 367 int l=-1; 369 368 370 switch(emmtype) { 371 case GLOBAL: l=dvbapi_find_emmpid(demux_index, T_GLOBAL); break; 372 case SHARED: l=dvbapi_find_emmpid(demux_index, T_SHARED); break; 373 case UNIQUE: l=dvbapi_find_emmpid(demux_index, T_UNIQUE); break; 374 } 369 if ( (filter[0] && ((demux[demux_index].rdr->b_nano[filter[0]] & 0x01) && !(demux[demux_index].rdr->b_nano[filter[0]] & 0x02))) ) 370 continue; 371 372 if ((demux[demux_index].rdr->blockemm & emmtype) && !(demux[demux_index].rdr->b_nano[filter[0]] & 0x02)) 373 continue; 374 375 l = dvbapi_find_emmpid(demux_index, emmtype); 375 376 376 377 if (l>-1) { 377 cs_debug_mask(D_DVBAPI, "starting emm filter %s, pid: 0x%04X", typtext[emmtype], demux[demux_index].EMMpids[l].PID); 378 cs_ddump_mask(D_DVBAPI, filter, 32, "demux filter:"); 378 cs_ddump_mask(D_DVBAPI, filter, 32, "starting emm filter type %d, pid: 0x%04X", emmtype, demux[demux_index].EMMpids[l].PID); 379 379 dvbapi_set_filter(demux_index, selected_api, demux[demux_index].EMMpids[l].PID, filter, filter+16, 0, demux[demux_index].pidindex, count, TYPE_EMM); 380 380 } else { … … 441 441 switch (caid >> 8) { 442 442 case 0x01: 443 dvbapi_add_emmpid(demux_id, caid, emm_pid, 0, T_UNIQUE);443 dvbapi_add_emmpid(demux_id, caid, emm_pid, 0, EMM_UNIQUE); 444 444 cs_debug_mask(D_DVBAPI, "[cat] CAID: %04x\tEMM_PID: %04x", caid, emm_pid); 445 445 for (k = i+7; k < i+buf[i+1]+2; k += 4) { … … 447 447 emm_pid = (buf[k] & 0x0F) << 8 | buf[k+1]; 448 448 cs_debug_mask(D_DVBAPI, "[cat] CAID: %04X\tEMM_PID: %04X\tPROVID: %06X", caid, emm_pid, emm_provider); 449 dvbapi_add_emmpid(demux_id, caid, emm_pid, emm_provider, T_SHARED);449 dvbapi_add_emmpid(demux_id, caid, emm_pid, emm_provider, EMM_SHARED); 450 450 } 451 451 break; … … 455 455 emm_provider = buf[k+2] << 16 | (buf[k+3] << 8| (buf[k+4] & 0xF0)); 456 456 cs_debug_mask(D_DVBAPI, "[cat] CAID: %04x\tEMM_PID: %04x\tPROVID: %06X", caid, emm_pid, emm_provider); 457 dvbapi_add_emmpid(demux_id, caid, emm_pid, emm_provider, T_UNIQUE|T_SHARED|T_GLOBAL);457 dvbapi_add_emmpid(demux_id, caid, emm_pid, emm_provider, EMM_UNIQUE|EMM_SHARED|EMM_GLOBAL); 458 458 } 459 459 } … … 462 462 emm_provider = (buf[i+1] == 0x07) ? (buf[i+6] << 16 | (buf[i+7] << 8| (buf[i+8]))) : 0; 463 463 cs_debug_mask(D_DVBAPI, "[cat] CAID: %04x\tEMM_PID: %04x\tPROVID: %06X", caid, emm_pid, emm_provider); 464 dvbapi_add_emmpid(demux_id, caid, emm_pid, emm_provider, T_UNIQUE|T_SHARED|T_GLOBAL);464 dvbapi_add_emmpid(demux_id, caid, emm_pid, emm_provider, EMM_UNIQUE|EMM_SHARED|EMM_GLOBAL); 465 465 break; 466 466 default: 467 467 cs_debug_mask(D_DVBAPI, "[cat] CAID: %04x\tEMM_PID: %04x", caid, emm_pid); 468 dvbapi_add_emmpid(demux_id, caid, emm_pid, 0, T_UNIQUE|T_SHARED|T_GLOBAL);468 dvbapi_add_emmpid(demux_id, caid, emm_pid, 0, EMM_UNIQUE|EMM_SHARED|EMM_GLOBAL); 469 469 break; 470 470 }
Note:
See TracChangeset
for help on using the changeset viewer.