Mercurial > mplayer.hg
view input/joystick.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 | 610a11e4db36 |
| children | 6ac1ece1f9fe |
line wrap: on
line source
#define JOY_BASE (0x100+128) #define JOY_AXIS0_PLUS (JOY_BASE+0) #define JOY_AXIS0_MINUS (JOY_BASE+1) #define JOY_AXIS1_PLUS (JOY_BASE+2) #define JOY_AXIS1_MINUS (JOY_BASE+3) #define JOY_AXIS2_PLUS (JOY_BASE+4) #define JOY_AXIS2_MINUS (JOY_BASE+5) #define JOY_AXIS3_PLUS (JOY_BASE+6) #define JOY_AXIS3_MINUS (JOY_BASE+7) #define JOY_AXIS4_PLUS (JOY_BASE+8) #define JOY_AXIS4_MINUS (JOY_BASE+9) #define JOY_AXIS5_PLUS (JOY_BASE+10) #define JOY_AXIS5_MINUS (JOY_BASE+11) #define JOY_AXIS6_PLUS (JOY_BASE+12) #define JOY_AXIS6_MINUS (JOY_BASE+13) #define JOY_AXIS7_PLUS (JOY_BASE+14) #define JOY_AXIS7_MINUS (JOY_BASE+15) #define JOY_AXIS8_PLUS (JOY_BASE+16) #define JOY_AXIS8_MINUS (JOY_BASE+17) #define JOY_AXIS9_PLUS (JOY_BASE+18) #define JOY_AXIS9_MINUS (JOY_BASE+19) #define JOY_BTN_BASE ((0x100+148)|MP_NO_REPEAT_KEY) #define JOY_BTN0 (JOY_BTN_BASE+0) #define JOY_BTN1 (JOY_BTN_BASE+1) #define JOY_BTN2 (JOY_BTN_BASE+2) #define JOY_BTN3 (JOY_BTN_BASE+3) #define JOY_BTN4 (JOY_BTN_BASE+4) #define JOY_BTN5 (JOY_BTN_BASE+5) #define JOY_BTN6 (JOY_BTN_BASE+6) #define JOY_BTN7 (JOY_BTN_BASE+7) #define JOY_BTN8 (JOY_BTN_BASE+8) #define JOY_BTN9 (JOY_BTN_BASE+9) int mp_input_joystick_init(char* dev); int mp_input_joystick_read(int fd);