RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-01 23:00:41 +00:00
Code Issues Releases Wiki Activity

- fixed the input buffering (don't read input unless we're already processed

Browse Source 
all decoded samples)
- fix 100l bug: uninitialized ogg_packet structure caused tremor to hang


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9170 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2003-01-29 22:45:07 +00:00
parent cc33989342
commit 0997e96229
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libmpcodecs/ad_libvorbis.c
View File

@ -188,22 +188,24 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
int samples; int samples;
float **pcm; float **pcm;
float scale; float scale;
ogg_packet op;
struct ov_struct_st *ov = sh->context; struct ov_struct_st *ov = sh->context;
op.b_o_s = op.e_o_s = 0;
while(len < minlen) { while(len < minlen) {
while((samples=vorbis_synthesis_pcmout(&ov->vd,&pcm))<=0){
ogg_packet op;
memset(&op,0,sizeof(op)); //op.b_o_s = op.e_o_s = 0;
op.bytes = ds_get_packet(sh->ds,&op.packet); op.bytes = ds_get_packet(sh->ds,&op.packet);
if(!op.packet) if(op.bytes<=0) break;
break;
if(vorbis_synthesis(&ov->vb,&op)==0) /* test for success! */ if(vorbis_synthesis(&ov->vb,&op)==0) /* test for success! */
vorbis_synthesis_blockin(&ov->vd,&ov->vb); vorbis_synthesis_blockin(&ov->vd,&ov->vb);
while((samples=vorbis_synthesis_pcmout(&ov->vd,&pcm))>0){ }
if(samples<=0) break; // error/EOF
while(samples>0){
int i,j; int i,j;
int clipflag=0; int clipflag=0;
int convsize=(maxlen-len)/(2*ov->vi.channels); // max size! int convsize=(maxlen-len)/(2*ov->vi.channels); // max size!
int bout=(samples<convsize?samples:convsize); int bout=((samples<convsize)?samples:convsize);
if(bout<=0) break; if(bout<=0) break; // no buffer space
/* convert floats to 16 bit signed ints (host order) and /* convert floats to 16 bit signed ints (host order) and
interleave */ interleave */
@ -265,10 +267,12 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"Clipping in frame %ld\n",(long)(ov->vd.sequence)); mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"Clipping in frame %ld\n",(long)(ov->vd.sequence));
len+=2*ov->vi.channels*bout; len+=2*ov->vi.channels*bout;
mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"\n[decoded: %d / %d ]\n",bout,samples); mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"\n[decoded: %d / %d ]\n",bout,samples);
samples-=bout;
vorbis_synthesis_read(&ov->vd,bout); /* tell libvorbis how vorbis_synthesis_read(&ov->vd,bout); /* tell libvorbis how
many samples we many samples we
actually consumed */ actually consumed */
} } //while(samples>0)
// if (!samples) break; // why? how?
} }