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

tsdemux: pass TS continuity errors to subscriptions

Browse source
This commit is contained in:
Jaroslav Kysela 2015-01-30 21:49:37 +01:00
parent 5eca4d7be8
commit adcd748fc0
4 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,7 @@
#define TS_REMUX_BUFSIZE (188 * 100)
static void ts_remux(mpegts_service_t *t, const uint8_t *tsb);
static void ts_remux(mpegts_service_t *t, const uint8_t *tsb, int error);
/**
* Continue processing of transport stream packets
@ -55,11 +55,11 @@ ts_recv_packet0
service_set_streaming_status_flags((service_t*)t, TSS_MUX_PACKETS);
if(streaming_pad_probe_type(&t->s_streaming_pad, SMT_MPEGTS))
ts_remux(t, tsb);
if (!st)
if (!st) {
if(streaming_pad_probe_type(&t->s_streaming_pad, SMT_MPEGTS))
ts_remux(t, tsb, 0);
return;
}
error = !!(tsb[1] & 0x80);
pusi = !!(tsb[1] & 0x40);
@ -79,11 +79,16 @@ ts_recv_packet0
// Mark as error if this is not the first packet of a payload
if(!pusi)
error |= 0x2;
error |= 2;
error |= 4;
}
st->es_cc = (cc + 1) & 0xf;
}
if(streaming_pad_probe_type(&t->s_streaming_pad, SMT_MPEGTS))
ts_remux(t, tsb, error);
off = tsb[3] & 0x20 ? tsb[4] + 5 : 4;
switch(st->es_type) {
@ -97,12 +102,11 @@ ts_recv_packet0
if(st->es_type == SCT_TELETEXT)
teletext_input(t, st, tsb);
if(off > 188)
break;
if(t->s_status == SERVICE_RUNNING)
parse_mpeg_ts((service_t*)t, st, tsb + off, 188 - off, pusi, error);
parse_mpeg_ts((service_t*)t, st, tsb + off, 188 - off, pusi, error & 3);
break;
}
}
@ -264,7 +268,7 @@ ts_recv_packet2(mpegts_service_t *t, const uint8_t *tsb)
*
*/
static void
ts_remux(mpegts_service_t *t, const uint8_t *src)
ts_remux(mpegts_service_t *t, const uint8_t *src, int error)
{
streaming_message_t sm;
pktbuf_t *pb;
@ -275,10 +279,14 @@ ts_remux(mpegts_service_t *t, const uint8_t *src)
sbuf_append(sb, src, 188);
if (error)
sb->sb_err++;
if(sb->sb_ptr < TS_REMUX_BUFSIZE)
return;
pb = pktbuf_alloc(sb->sb_data, sb->sb_ptr);
pb->pb_err = sb->sb_err;
sm.sm_type = SMT_MPEGTS;
sm.sm_data = pb;

1
src/packet.h
View file

@ -25,6 +25,7 @@
typedef struct pktbuf {
int pb_refcount;
int pb_err;
uint8_t *pb_data;
size_t pb_size;
} pktbuf_t;

2
src/subscriptions.c
View file

@ -432,6 +432,8 @@ subscription_input_direct(void *opauqe, streaming_message_t *sm)
s->ths_bytes_in += pkt->pkt_payload->pb_size;
} else if(sm->sm_type == SMT_MPEGTS) {
pktbuf_t *pb = sm->sm_data;
if(pb->pb_err)
s->ths_total_err += pb->pb_err;
s->ths_bytes_in += pb->pb_size;
}

8
src/tvheadend.h
View file

@ -504,10 +504,10 @@ typedef struct streaming_queue {
*/
typedef struct sbuf {
uint8_t *sb_data;
int sb_ptr;
int sb_size;
unsigned int sb_err : 1;
unsigned int sb_bswap: 1;
int sb_ptr;
int sb_size;
uint16_t sb_err;
uint8_t sb_bswap;
} sbuf_t;