stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

tsdemux: move the error handling to the parsers.c

Browse source
This commit is contained in:
Jaroslav Kysela 2015-01-31 16:55:40 +01:00
parent e2f9483dbe
commit bdfc4d779f
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/input/mpegts/tsdemux.c
View file

@ -76,12 +76,7 @@ ts_recv_packet0
service_component_nicename(st), st->es_cc_log.count);
avgstat_add(&t->s_cc_errors, 1, dispatch_clock);
avgstat_add(&st->es_cc_errors, 1, dispatch_clock);
// Mark as error if this is not the first packet of a payload
if(!pusi)
error |= 2;
error |= 4;
error |= 2;
}
st->es_cc = (cc + 1) & 0xf;
}
@ -106,7 +101,7 @@ ts_recv_packet0
break;
if(t->s_status == SERVICE_RUNNING)
parse_mpeg_ts((service_t*)t, st, tsb + off, 188 - off, pusi, error & 3);
parse_mpeg_ts((service_t*)t, st, tsb + off, 188 - off, pusi, error);
break;
}
}

2
src/parsers/parsers.c
View file

@ -134,7 +134,7 @@ parse_mpeg_ts(service_t *t, elementary_stream_t *st, const uint8_t *data,
int len, int start, int err)
{
if(err)
if(err && (err != 2 || !start))
sbuf_err(&st->es_buf);
switch(st->es_type) {