RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

prevent buffer underflow; the code is still incorrect and leads to desync but at least it doesn't crash 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19125 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nicodvb 2006-07-16 16:34:05 +00:00
parent 04bbf4bf3b
commit 9059d9f95e
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libmpcodecs/ad_hwmpa.c
View File

@ -14,7 +14,6 @@
#include "libmpdemux/mp3_hdr.h"
//based on ad_hwac3.c and ad_libmad.c
static int isdts = -1;
static ad_info_t info =
{
@ -84,23 +83,33 @@ static int init(sh_audio_t *sh)
static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
{
int len, start, cnt2, tot;
int len, start, tot;
int chans, srate, spf, mpa_layer, br;
tot = cnt2 = 0;
while(tot < minlen && tot+4608<=maxlen)
tot = 0;
while(tot < minlen)
{
start = mpa_sync(sh, 1, &len, &chans, &srate, &spf, &mpa_layer, &br);
if(start < 0)
if(start < 0 || tot + len > maxlen)
break;
if(start + len < sh->a_in_buffer_len && start + len >= maxlen)
break;
memcpy(&buf[cnt2], &(sh->a_in_buffer[start]), len);
cnt2 += len;
if(start + len > sh->a_in_buffer_len)
{
int l;
l = min(sh->a_in_buffer_size - sh->a_in_buffer_len, start + len);
l = demux_read_data(sh->ds,&sh->a_in_buffer[sh->a_in_buffer_len], l);
if(! l)
return tot;
sh->a_in_buffer_len += l;
continue;
}
memcpy(&buf[tot], &(sh->a_in_buffer[start]), len);
tot += len;
sh->a_in_buffer_len -= start + len;
memmove(sh->a_in_buffer, &(sh->a_in_buffer[start + len]), sh->a_in_buffer_len);
tot += start + len;
}
return tot;