summaryrefslogtreecommitdiffstats
path: root/libao2/audio_out.c
Commit message (Collapse)AuthorAgeFilesLines
* audio: move ready-for-ao data buffer from decoder to AOUoti Urpala2011-07-021-0/+6
| | | | | | | | | | | | Move the buffer storing audio data ready to be fed to the audio output driver from the audio decoder object to the AO object. This will help encoding code deal with end of input, and may also be useful to improve other general gapless audio behavior (as AOs which do not accept chunks smaller than a certain size may keep them in the buffer while the decoder changes). Less data may be dropped now when changing audio filters or switching timeline parts.
* ao_rsound: add new RSound audio output driverHans-Kristian Arntzen2011-06-261-0/+4
|
* ao: fix crash after ao init failure (from recent 3a5fd15fa2)Uoti Urpala2011-05-161-1/+3
| | | | | | | | If opening an audio output driver using the old API failed the "global_ao" variable was not set back to NULL as it should have been. This caused an assert failure the next time there was an attempt to open such an AO (either due to fallback to another AO after the failure or after moving to another file). Fix.
* ao_pcm, core: use new API in ao_pcm, change timing with itUoti Urpala2011-05-051-3/+10
| | | | | | | | | | | | | | | | | Change ao_pcm to use the new audio output driver API and clean up some of the code. Rewrite the logic controlling how playback timing works when using -ao pcm. Deprecate the "fast" suboption; its only effect now is to print a warning, but it's still accepted so that specifying it is not an error. Before, timing with -ao pcm and video enabled had two possible modes. In the default mode playback speed was rather arbitrary - not realtime, but not particularly fast. -ao pcm:fast tried to play back at maximum video playback speed - mostly succeeding, but not quite guaranteed to work in all cases. Now the default is to play at realtime speed. The -benchmark option can now be used to get faster playback (same as the video-only case). In the audio-only case playback is always maximum speed.
* audio output: add a new AO driver APIUoti Urpala2011-05-051-52/+114
| | | | | | | Add a new audio output driver API. The main change is the addition of a context struct where data can be kept instead of using globals. The old API remains available. This commit does not yet convert any driver to use the new API.
* cleanup: reindent audio_out.[ch]Uoti Urpala2011-05-041-30/+31
| | | | | | Reindent audio_out.c and audio_out.h. Also remove trailing '_s' from two struct names (which are not currently used anywhere) and make the audio_out_drivers[] table static.
* audio: change external AO interface to "ao_[method](ao, ...)"Uoti Urpala2011-04-091-41/+107
| | | | | | | | Make the outside interface of audio output handling similar to the video output one. An AO object is first created, and then methods called with ao_[methodname](ao, args...). However internally libao2/ still holds all data in globals, and trying to create multiple simultaneous AO instances won't work.
* vo_dxr2, ao_dxr2: drop dxr2 supportUoti Urpala2011-01-311-4/+0
| | | | | | dxr2 support had been broken quite a while and nobody noticed. There were finally commits to fix it in the svn repo, but rather than apply those I'll just drop dxr2 support.
* cleanup: remove NULL checks before free() all over the codecboesch2010-11-141-8/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
* Delete things related to old translation systemUoti Urpala2010-03-101-1/+0
| | | | | Remove the help/ subdirectory, configure code to create toplevel help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
* Merge svn changes up to r30484Uoti Urpala2010-03-091-0/+4
|\
| * Add OS/2 KAI audio driver supportkomh2010-02-011-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30481 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-1/+0
| |
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-071-5/+5
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-5/+5
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | Merge svn changes up to r29277Uoti Urpala2009-05-081-2/+2
|\|
| * Rename macosx audio output driver to coreaudio.diego2009-05-041-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29251 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28862Uoti Urpala2009-03-071-22/+26
|\|
| * Make audio_out_* structs const so they end up in .rodatareimar2009-03-061-23/+23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28859 b3059339-0415-0410-9bf9-f77b7e298cf2
| * DART audio output driver for OS/2 by KO Myung-Hun, komh chollian netdiego2009-03-011-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28775 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28403Uoti Urpala2009-01-311-0/+18
|\|
| * Add standard license headers.diego2009-01-261-0/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28378 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove special error message for -ao alsa1x and alsa9Uoti Urpala2008-08-121-5/+0
|/ | | | | | Those variants were removed in 2004. Remove the special handling of those ao names and treat them like any other unrecognized ao name. This removes a questionable exit_player() call.
* Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x.diego2008-08-061-1/+1
| | | | | | | Use it in all the places that checked for either ALSA 0.9 or 1.x. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27422 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename all preprocessor directives related to Apple / Mac OS X.diego2008-08-061-1/+1
| | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27420 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename some audio-output-related preprocessor directives.diego2008-08-051-5/+5
| | | | | | | Switch them from a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27419 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change a bunch of video/audio-output-specific preprocessor directives fromdiego2008-08-031-4/+4
| | | | | | | a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
* Start unifying names of internal preprocessor directives.diego2008-07-301-8/+8
| | | | | | | | Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add verbose messages about trying and searching for audio output drivers.corey2008-06-221-0/+12
| | | | | | | | | Add messages showing why a specified audio output driver failed to be used. Based on a patch from Bryan Henderson, giraffedata [[]] gmail :: com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27123 b3059339-0415-0410-9bf9-f77b7e298cf2
* Introduce a separate definition for Mac OS X coreaudio support.diego2008-03-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26240 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge two #ifdefs.diego2008-03-011-4/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26134 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: reindent, detabifydiego2008-03-011-44/+44
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26133 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove duplicate extern declaration.diego2008-03-011-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26132 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove pointless #ifdefs around extern declarations.diego2008-02-201-38/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26039 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_functions_t should be const, part 1reimar2008-02-011-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25945 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace Polyp- by PulseAudio output.reimar2007-10-181-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24809 b3059339-0415-0410-9bf9-f77b7e298cf2
* v4l2 audio/video outputs for linux 2.6.22+ kernels (outputs formerly known ↵ben2007-07-291-0/+6
| | | | | | as ivtv) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23925 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move mpeg aos to the end of the autodetection list. At least mpegpesuau2006-08-161-8/+7
| | | | | | | | should be there since it now works without the corresponding vo but is not a particularly good ao overall. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19415 b3059339-0415-0410-9bf9-f77b7e298cf2
* added audio output for ivtv cardsben2006-07-281-1/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19229 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get ride of the several if(identify) messy lines and rearangment of some of ↵reynaldo2006-04-241-2/+1
| | | | | | the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2
* Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT ↵reynaldo2006-03-301-2/+2
| | | | | | chello DOT hu git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17995 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix compilation without openalaurel2006-02-161-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17635 b3059339-0415-0410-9bf9-f77b7e298cf2
* OpenAL audio support, actual output is mono-only (no positioning yet).reimar2006-02-161-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17634 b3059339-0415-0410-9bf9-f77b7e298cf2
* Patch by Stefan Huehner / stefan % huehner ! org \rathann2006-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | patch replaces '()' for the correct '(void)' in function declarations/prototypes which have no parameters. The '()' syntax tell thats there is a variable list of arguments, so that the compiler cannot check this. The extra CFLAG '-Wstrict-declarations' shows those cases. Comments about a similar patch applied to ffmpeg: That in C++ these mean the same, but in ANSI C the semantics are different; function() is an (obsolete) K&R C style forward declaration, it basically means that the function can have any number and any types of parameters, effectively completely preventing the compiler from doing any sort of type checking. -- Erik Slagter Defining functions with unspecified arguments is allowed but bad. With arguments unspecified the compiler can't report an error/warning if the function is called with incorrect arguments. -- Måns Rullgård git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_macosx is a native audio output driver and should thus have prioritydiego2005-10-111-3/+3
| | | | | | | over non-native outputs drivers like ao_sdl and the like. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16733 b3059339-0415-0410-9bf9-f77b7e298cf2
* adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM ↵gpoirier2005-06-201-0/+2
| | | | | | en DASH directo POUM net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15790 b3059339-0415-0410-9bf9-f77b7e298cf2
* - fix gcc warnings, strlcat/strlcpy prototypesrathann2005-04-061-0/+1
| | | | | | | - fix bad sscanf usage in geometry.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15059 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use audio plugins anymorereimar2004-12-271-10/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14255 b3059339-0415-0410-9bf9-f77b7e298cf2
* removing AFMT_ dependancyalex2004-12-271-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14246 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make include paths consistent.diego2004-12-071-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14124 b3059339-0415-0410-9bf9-f77b7e298cf2
* polyaudio audio driver patch by Lennart Poettering <mzzcynlre at 0pointer.de>faust32004-11-051-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13879 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed small memleaksreimar2004-10-131-7/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13633 b3059339-0415-0410-9bf9-f77b7e298cf2
* removing ao_alsa9.c and ao_alsa1x.c as they are superseded by ao_alsa.creimar2004-10-041-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13543 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed small memleakreimar2004-10-011-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13521 b3059339-0415-0410-9bf9-f77b7e298cf2
* directsound audio output plugin, patch by Gabor Szecsi <deje at miki.hu> ↵faust32004-09-251-0/+6
| | | | | | some minor modifications by me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13461 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_macosx is fixed, moving it back to topnplourde2004-07-101-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12793 b3059339-0415-0410-9bf9-f77b7e298cf2
* JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>alex2004-06-251-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12663 b3059339-0415-0410-9bf9-f77b7e298cf2
* move macosx in the priority list after sdl, patch by Dan Christiansenalex2004-06-251-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12637 b3059339-0415-0410-9bf9-f77b7e298cf2
* changes for alsa9/1.x-merge only alsajoyping2004-05-121-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12463 b3059339-0415-0410-9bf9-f77b7e298cf2
* ALSA 1.x audio out driverhenry2004-01-111-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11776 b3059339-0415-0410-9bf9-f77b7e298cf2
* Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>alex2003-05-211-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10148 b3059339-0415-0410-9bf9-f77b7e298cf2
* 64bit libao2 fix by Jens Axboe <mplayer-dev@kernel.dk>alex2003-03-211-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9634 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rearrange the vo and ao driver order to prefer the native drivers and givediego2003-01-031-3/+3
| | | | | | | a better out of the box experience on Cygwin. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8730 b3059339-0415-0410-9bf9-f77b7e298cf2
* new EsounD audio driver (-ao esd)jkeil2002-12-271-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8573 b3059339-0415-0410-9bf9-f77b7e298cf2
* add ao_win32faust32002-10-251-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7917 b3059339-0415-0410-9bf9-f77b7e298cf2
* compiler warning fixes by Dominikarpi2002-10-221-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7849 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10larpi2002-10-061-20/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7610 b3059339-0415-0410-9bf9-f77b7e298cf2
* audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)arpi2002-09-291-0/+52
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7564 b3059339-0415-0410-9bf9-f77b7e298cf2
* aRts audio out support by Michele Balistreri <brain at email.it>atmos42002-05-281-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6215 b3059339-0415-0410-9bf9-f77b7e298cf2
* Initial support for dxr2. Based on patch from Tobias Diedrich <ranma@gmx.at>.albeu2002-05-131-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6070 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l. -ao mpegpes shouldn't be disabled if no DVBarpi2002-03-191-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5193 b3059339-0415-0410-9bf9-f77b7e298cf2
* Moved HW dependent mixer stuff to libao and removed master switchanders2002-02-211-2/+6
| | |