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

Implement the TS packet demuxer as a startcode parser instead of relying on the payload-unit-start-indicator bit.

Browse source 
This delivers packets faster thru the system for sources that only sets the payload-unit-start-indicator bits on I-frames
This commit is contained in:
Andreas Öman 2008-01-28 21:53:49 +00:00
parent ad616af64f
commit a1785d95c2
3 changed files with 64 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
pes.c
View file

@ -62,6 +62,66 @@ static void pes_compute_pts(th_transport_t *t, th_stream_t *st, th_pkt_t *pkt);
_pts; \
})
/**
* pes_reassembly()
*
*
*/
void
pes_reassembly(th_transport_t *t, th_stream_t *st, uint8_t *data,
int len, int start, int err)
{
uint32_t sc;
int i;
if(LIST_FIRST(&t->tht_muxers) == NULL)
return; /* No muxers will take packet, so drop here */
sc = st->st_startcond;
if(st->st_buffer == NULL) {
st->st_buffer_size = 4000;
st->st_buffer = malloc(st->st_buffer_size);
}
if(st->st_buffer_ptr + len >= st->st_buffer_size) {
st->st_buffer_size += len * 4;
st->st_buffer = realloc(st->st_buffer, st->st_buffer_size);
}
for(i = 0; i < len; i++) {
st->st_buffer[st->st_buffer_ptr++] = data[i];
sc = sc << 8 | data[i];
if((sc & 0xffffff00) == 0x00000100) {
/* Startcode condition */
switch(sc) {
case 0x000001e0 ... 0x000001ef:
case 0x000001c0 ... 0x000001cf:
case 0x000001bd:
st->st_buffer_ptr -= 4;
if(st->st_buffer_ptr < 0) {
/* Fake startcode, can be seen during stream start */
st->st_buffer_ptr = 0;
break;
}
if(st->st_startcode != 0) {
/* It would be nice to embed much of what's done in
* pes_packet_input() here to avoid a bunch of memcpy()s
*/
pes_packet_input(t, st, st->st_buffer + 2, st->st_buffer_ptr - 2);
st->st_buffer_ptr = 0;
}
st->st_startcode = sc;
break;
}
}
}
st->st_startcond = sc;
}

3
pes.h
View file

@ -24,4 +24,7 @@ int pes_packet_input(th_transport_t *th, th_stream_t *st, uint8_t *data,
void pes_compute_duration(th_transport_t *t, th_stream_t *st, th_pkt_t *pkt);
void pes_reassembly(th_transport_t *t, th_stream_t *st, uint8_t *data,
int len, int start, int err);
#endif /* PES_H */

57
tsdemux.c
View file

@ -49,61 +49,6 @@
#include "buffer.h"
#include "tsdemux.h"
static int
ts_reassembly_pes(th_transport_t *t, th_stream_t *st, uint8_t *data, int len)
{
int l2;
if(len < 9)
return -1;
if(data[0] != 0 || data[1] != 0 || data[2] != 1)
return -1;
l2 = (data[4] << 8) | data[5];
len -= 6;
data += 6;
return pes_packet_input(t, st, data, len);
}
/*
* TS packet reassembly
*/
static void
ts_reassembly(th_transport_t *t, th_stream_t *st, uint8_t *data, int len,
int pusi, int err)
{
if(pusi) {
if(ts_reassembly_pes(t, st, st->st_buffer, st->st_buffer_ptr) == 0)
st->st_buffer = NULL; /* Memory was consumed by pes_packet_input() */
st->st_buffer_ptr = 0;
st->st_buffer_errors = 0;
if(st->st_buffer == NULL) {
if(st->st_buffer_size < 1000)
st->st_buffer_size = 4000;
st->st_buffer = malloc(st->st_buffer_size);
}
}
if(st->st_buffer == NULL)
return;
st->st_buffer_errors += err;
if(st->st_buffer_ptr + len >= st->st_buffer_size) {
st->st_buffer_size += len * 4;
st->st_buffer = realloc(st->st_buffer, st->st_buffer_size);
}
memcpy(st->st_buffer + st->st_buffer_ptr, data, len);
st->st_buffer_ptr += len;
}
/**
* Code for dealing with a complete section
@ -216,7 +161,7 @@ ts_recv_packet(th_transport_t *t, int pid, uint8_t *tsb, int dodescramble)
if(afl > 188)
break;
ts_reassembly(t, st, tsb + afl, 188 - afl, pusi, err);
pes_reassembly(t, st, tsb + afl, 188 - afl, pusi, err);
break;
}
}