frodovdr
/
octonet
mirror of https://github.com/DigitalDevices/octonet.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix addpid

This commit is contained in:
Ralph Metzler 2016-11-17 16:35:33 +01:00
parent 3d45ccf6fc
commit a0e2ee78dc
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
octoserve/octoserve.c
View File

@ -1426,20 +1426,22 @@ static int merge_pids(struct dvb_params *op, struct dvb_params *p)
{
int i, r = 0;
dbgprintf(DEBUG_SYS, "merge_pids\n");
if (p->set & (1UL << PARAM_PID))
for (i = 0 ; i < 1024 ; i++)
for (i = 0; i < 1024; i++)
if (op->pid[i] != p->pid[i]) {
r |= 1;
op->pid[i] = p->pid[i];
}
if (p->set & (1UL << PARAM_APID))
for (i = 0 ; i < 1024 ; i++)
if (!(op->pid[i] & p->pid[i])) {
for (i = 0; i < 1024; i++)
if ((~op->pid[i]) & p->pid[i]) {
r |= 2;
op->pid[i] |= p->pid[i];
}
if (p->set & (1UL << PARAM_DPID))
for (i = 0 ; i < 1024 ; i++)
for (i = 0; i < 1024; i++)
if (op->pid[i] & p->dpid[i]) {
r |= 4;
op->pid[i] &= ~p->dpid[i];