Mercurial > mplayer.hg
view mp3lib/mp3.h @ 24590:2c238fa777ff
ao_alsa: Fix get_space() return values larger than buffersize
After a buffer underrun the ALSA get_space() function sometimes returned
values larger than the ao had set in ao_data.buffersize. Fix this by
replacing the old check against MAX_OUTBURST by one against
ao_data.buffersize. There should be no need for the MAX_OUTBURST check;
the current MPlayer side should no longer have any constant limit on the
amount of data an ao can buffer or request at once.
The get_space() values larger than ao_data.buffersize triggered errors
in audio decoding causing the current attempt to fill audio buffers to
be aborted. I'm not sure how often that caused behavior noticeably worse
then an underrun already is.
author | uau |
---|---|
date | Mon, 24 Sep 2007 21:49:58 +0000 |
parents | f580a7755ac5 |
children | e7c989f7a7c9 |
line wrap: on
line source
/* MP3 Player Library 2.0 (C) 1999 A'rpi/Astral&ESP-team */ /* decoder level: */ #ifdef USE_FAKE_MONO extern void MP3_Init(int fakemono); #else extern void MP3_Init(); #endif extern int MP3_Open(char *filename,int buffsize); extern void MP3_SeekFrame(int num,int dir); extern void MP3_SeekForward(int num); extern int MP3_PrintTAG(void); extern int MP3_DecodeFrame(unsigned char *hova,short single); extern int MP3_FillBuffers(void); extern void MP3_PrintHeader(void); extern void MP3_Close(void); /* public variables: */ extern int MP3_eof; // set if EOF reached extern int MP3_pause; // lock playing /* informational: */ extern int MP3_filesize; // filesize extern int MP3_frames; // current frame no extern int MP3_fpos; // current file pos extern int MP3_framesize; // current framesize in bytes (including header) extern int MP3_bitrate; // current bitrate (kbits) extern int MP3_samplerate; // current sampling freq (Hz) extern int MP3_channels; extern int MP3_bps; /* player level: */ extern int MP3_OpenDevice(char *devname); /* devname can be NULL for default) */ extern void MP3_Play(void); extern void MP3_Stop(void); extern void MP3_CloseDevice(void);