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

Add support for bounded PES packets in MPEG video.

Browse source 
Ticket #233
This commit is contained in:
Andreas Öman 2010-07-01 07:13:47 +00:00
parent d64e75cf57
commit 639659c1f6
2 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/parsers.c
View file

@ -358,6 +358,26 @@ parse_sc(th_transport_t *t, th_stream_t *st, const uint8_t *data, int len,
buffer_alloc(st, len);
for(i = 0; i < len; i++) {
if(st->st_ssc_intercept == 1) {
if(st->st_ssc_ptr < sizeof(st->st_ssc_buf))
st->st_ssc_buf[st->st_ssc_ptr] = data[i];
st->st_ssc_ptr++;
if(st->st_ssc_ptr < 5)
continue;
int hlen = st->st_ssc_buf[4];
if(st->st_ssc_ptr < hlen + 5)
continue;
parse_pes_header(t, st, st->st_ssc_buf + 2, hlen + 3);
st->st_ssc_intercept = 0;
continue;
}
st->st_buffer[st->st_buffer_ptr++] = data[i];
sc = sc << 8 | data[i];
@ -370,6 +390,13 @@ parse_sc(th_transport_t *t, th_stream_t *st, const uint8_t *data, int len,
r = vp(t, st, r, sc, st->st_startcode_offset);
if(r == 3)
continue;
if(r == 4) {
st->st_buffer_ptr -= 4;
st->st_ssc_intercept = 1;
st->st_ssc_ptr = 0;
sc = -1;
continue;
}
} else {
r = 1;
}
@ -860,13 +887,18 @@ parse_mpeg2video(th_transport_t *t, th_stream_t *st, size_t len,
bitstream_t bs;
int frametype;
if(next_startcode == 0x1e0)
return 4;
init_bits(&bs, buf + 4, (len - 4) * 8);
switch(st->st_startcode) {
case 0x000001e0 ... 0x000001ef:
/* System start codes for video */
if(len >= 9)
parse_pes_header(t, st, buf + 6, len - 6);
if(len < 9)
return 1;
parse_pes_header(t, st, buf + 6, len - 6);
return 1;
case 0x00000100:

4
src/tvhead.h
View file

@ -424,6 +424,10 @@ typedef struct th_stream {
uint8_t *st_global_data;
int st_global_data_len;
int st_ssc_intercept;
int st_ssc_ptr;
uint8_t st_ssc_buf[32];
struct th_pkt *st_curpkt;
int64_t st_curpts;
int64_t st_curdts;