Mercurial > mplayer.hg
view vidix/dha.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 | aa6833574b03 |
children | 3baf6a2283da |
line wrap: on
line source
/* * VIDIX Direct Hardware Access (DHA). * Copyright (C) 2002 Nick Kurshev * * This file is part of MPlayer. * * MPlayer is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * MPlayer is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with MPlayer; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * 1996/10/27 - Robin Cutshaw (robin@xfree86.org) * XFree86 3.3.3 implementation * 1999 - Øyvind Aabling. * Modified for GATOS/win/gfxdump. * * 2002 - library implementation by Nick Kurshev * - dhahelper and some changes by Alex Beregszaszi * * Supported O/S's: SVR4, UnixWare, SCO, Solaris, * FreeBSD, NetBSD, 386BSD, BSDI BSD/386, * Linux, Mach/386, ISC * DOS (WATCOM 9.5 compiler), Win9x (with mapdev.vxd) * Original location: www.linuxvideo.org/gatos */ #ifndef LIBDHA_H #define LIBDHA_H #ifdef __cplusplus extern "C" { #endif #define MAX_DEV_PER_VENDOR_CFG1 64 #define MAX_PCI_DEVICES_PER_BUS 32 #define MAX_PCI_DEVICES 64 #define PCI_MULTIFUNC_DEV 0x80 #define PCI_COMMAND_IO 0x1 /* Enable response to I/O space */ typedef struct pciinfo_s { int bus,card,func; /* PCI/AGP bus:card:func */ unsigned short command; /* Device control register */ unsigned short vendor,device; /* Card vendor+device ID */ unsigned base0,base1,base2,baserom; /* Memory and I/O base addresses */ // unsigned base0_limit, base1_limit, base2_limit, baserom_limit; }pciinfo_t; /* needed for mga_vid */ extern int pci_config_read(unsigned char bus, unsigned char dev, unsigned char func, unsigned char cmd, int len, unsigned long *val); /* Fill array pci_list which must have size MAX_PCI_DEVICES and return 0 if sucessful */ extern int pci_scan(pciinfo_t *pci_list,unsigned *num_card); /* Enables/disables accessing to IO space from application side. Should return 0 if o'k or errno on error. */ extern int enable_app_io( void ); extern int disable_app_io( void ); extern unsigned char INPORT8(unsigned idx); extern unsigned short INPORT16(unsigned idx); extern unsigned INPORT32(unsigned idx); #define INPORT(idx) INPORT32(idx) extern void OUTPORT8(unsigned idx,unsigned char val); extern void OUTPORT16(unsigned idx,unsigned short val); extern void OUTPORT32(unsigned idx,unsigned val); #define OUTPORT(idx,val) OUTPORT32(idx,val) extern void * map_phys_mem(unsigned long base, unsigned long size); extern void unmap_phys_mem(void *ptr, unsigned long size); /* These are the region types */ #define MTRR_TYPE_UNCACHABLE 0 #define MTRR_TYPE_WRCOMB 1 #define MTRR_TYPE_WRTHROUGH 4 #define MTRR_TYPE_WRPROT 5 #define MTRR_TYPE_WRBACK 6 extern int mtrr_set_type(unsigned base,unsigned size,int type); #ifdef __cplusplus } #endif #endif