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

Cleanup the ac3 parser and fix a bug (that mostly was unnoticed AFAIK)

Browse source
This commit is contained in:
Andreas Öman 2010-10-31 09:42:16 +00:00
parent a9dafa807b
commit 07e0362f4f
1 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/parsers.c
View file

@ -585,31 +585,20 @@ parse_ac3(th_transport_t *t, th_stream_t *st, size_t ilen,
for(i = 0; i < len - 6; i++) {
const uint8_t *p = buf + i;
if(ac3_valid_frame(p)) {
int bsid = p[5] & 0xf;
int fsize, sr;
int bsid = p[5] >> 3;
if(bsid <= 10) {
int fscod = p[4] >> 6;
int frmsizcod = p[4] & 0x3f;
fsize = ac3_frame_size_tab[frmsizcod][fscod] * 2;
bsid -= 8;
if(bsid < 0)
bsid = 0;
sr = ac3_freq_tab[fscod] >> bsid;
} else {
fsize = ((((p[2] & 0x7) << 8) | p[3]) + 1) * 2;
if((p[4] & 0xc0) == 0xc0) {
sr = ac3_freq_tab[(p[4] >> 4) & 3] / 2;
} else {
sr = ac3_freq_tab[(p[4] >> 6) & 3];
}
}
if(bsid > 10)
continue;
int fscod = p[4] >> 6;
int frmsizcod = p[4] & 0x3f;
int fsize = ac3_frame_size_tab[frmsizcod][fscod] * 2;
bsid -= 8;
if(bsid < 0)
bsid = 0;
int sr = ac3_freq_tab[fscod] >> bsid;
if(sr) {
int duration = 90000 * 1536 / sr;
int64_t dts = st->st_curdts;