Commit Graph

608 Commits

Author SHA1 Message Date
diego bc0058c63e cosmetics: Remove pointless parentheses from return statements.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26789 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 09:31:55 +00:00
diego b10c35e0ed Use standard license headers with standard formatting.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26775 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-14 18:02:27 +00:00
reimar c8b5921d06 Avoid dependency on newer pulseaudio version.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26681 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-07 22:46:50 +00:00
reimar 1758d95819 Remove a comment that makes no longer sense (since quite some time actually)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26637 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-01 16:59:37 +00:00
reimar 0f5ee4b7bd Support 32 bit float and integer formats in ao_pcm.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26636 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-01 16:58:52 +00:00
reimar 71247a97b3 Add support for 32 bit format to ao_pulse.
Based on patch by James Warden [warjamy yahoo com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26635 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-01 16:51:25 +00:00
reimar e1e2527cd4 Make ao_pulse fall back to s16le format instead of just failing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26634 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-01 16:47:54 +00:00
diego 2bcda50ffe Merge libao2/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26507 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 09:33:51 +00:00
reimar 9623100d13 reset() should not senselessly close and reopen
the device but instead just call flush_audio()


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26345 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-07 17:39:41 +00:00
reimar 885709eadd AUDIO_DRAIN makes no sense directly after opening
the device, but it should be done in uninit.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26344 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-07 17:32:44 +00:00
diego f9da8542dd Introduce a separate definition for Mac OS X coreaudio support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26240 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-15 08:54:21 +00:00
diego 2922e18092 Merge two #ifdefs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26134 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 09:45:38 +00:00
diego a09376d67b cosmetics: reindent, detabify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26133 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 09:04:00 +00:00
diego 4485a60c38 Remove duplicate extern declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26132 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 08:56:28 +00:00
diego 8efb2fa21c Add MPLAYER_ prefix to multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-22 09:09:46 +00:00
diego 77eb726c3d Remove pointless #ifdefs around extern declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26039 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-20 08:51:53 +00:00
diego 835c654bb0 typo fix: inited --> initialized
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:23:55 +00:00
reimar 6921ab9e24 ao_functions_t should be const, part 1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25945 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-01 20:11:14 +00:00
reimar 344013f8c7 Remove unused variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25942 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-30 23:49:36 +00:00
reimar c87beafb2c Fix get_space calculation to always leave some space, esp. for the currently playing buffer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25941 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-30 23:48:48 +00:00
reimar c470666c57 Change code to also work with different outburst sizes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25940 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-30 23:39:01 +00:00
reimar c8c416c516 Reduce number of UnqueueBuffer calls
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25939 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-30 23:37:30 +00:00
reimar 1a976d453f alSourceRewindv seems to be broken in particular in Creatives Windows-Implementation,
use alSourceStopv instead.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25938 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-30 22:28:41 +00:00
reimar 7172339ff9 Write functions used by send_mpeg_*_packet may _not_ modify data
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25701 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-12 16:05:04 +00:00
reimar 8c38419374 Make code slightly less confusing to me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25678 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-11 20:55:08 +00:00
reimar c9f2fed145 Slightly deobfuscate
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25677 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-11 20:42:32 +00:00
reimar c706a93140 Another small simplification. Slightly worse performance in the case
where a buffer underrun happens, but this really should not matter.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25676 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-11 20:36:33 +00:00
reimar 023340d6bd Slightly simplify read_buffer code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25675 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-11 20:32:42 +00:00
reimar 1b4cd62e0b Simplify: use memset
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25674 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-11 20:23:46 +00:00
reimar 27064210bc Fix indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25673 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-11 20:12:04 +00:00
reimar dfa7718673 Remove useless cast
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25672 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-11 20:10:39 +00:00
nicodvb 1b3cb7845a when :card isn't specified by the user search the first available card
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25586 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-02 20:34:48 +00:00
diego 2b6af2000b Add multiple inclusion guards to all header files that lack them.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25581 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 21:35:58 +00:00
diego fba0b66ff9 Add explanatory comments to the #endif part of multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25563 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-31 16:15:50 +00:00
ulion a8a8471995 Grammar fix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25505 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-22 18:12:03 +00:00
ulion 1c75b1f643 Add copyright info for s/pdif code from VideoLAN.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25504 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-22 17:33:28 +00:00
reimar 8f186a3535 pa_stream_write reportedly needs locking of the main loop
(could not find official documentation on this subject...)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25414 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-15 17:10:06 +00:00
reimar 65792a201f Fix indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25413 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-15 17:07:40 +00:00
reimar 8778005565 Remove pointless pa_stream_trigger call
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25412 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-15 17:06:59 +00:00
reimar fd77e65860 Documentation for waitop function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25411 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-15 16:58:25 +00:00
diego 7596a9ad27 SYS_AMIGAOS4 --> __AMIGAOS4__
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25363 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-11 20:39:18 +00:00
ulion 1ed6e96cfb Fix all current known multi-channel wrong order problems by adding
common functions for channel reordering.
This fixes these modules by adding channel reordering code for 5.0/5.1 audio:
ao: pcm
ad: dmo, faad, ffmpeg(ac3, dca, libfaad, liba52), pcm
ae: faac, lavc(ac3, libfaac), pcm


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25343 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-10 16:53:30 +00:00
ulion 1e53a65bf6 Remove useless variable aoIsCreated since we took good care of init failure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25318 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-08 02:57:50 +00:00
ulion 16cd94eb81 Add cleanup codes for init() failure to prevent leak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25293 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-04 12:38:31 +00:00
uau a655984828 Fix ao_null with float samples
ao_null accepts float input, but the code calculating ao_data.bps only
checked for 1-byte formats and used samplesize 2 for everything else.
Because ao_null uses the bps value in its timing calculations this
effectively made "playback" advance at half the correct speed.
Fixed by calculating samplesize with af_fmt2bits() instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25223 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-01 05:17:08 +00:00
uau 7e5c327c5a ao_null: Make duration of "buffered" audio constant
Choose the "buffer size" for the amount of audio the driver accepts so
that it corresponds to about 0.2 seconds of playback based on the
number of channels, sample size and samplerate.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25222 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-01 01:39:39 +00:00
reimar 3cc173f7e4 Make outburst and buffersize depend on channel count.
This should reduce the number of case where to much audio
is buffered ahead thus breaking interleaving.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25217 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-30 22:15:01 +00:00
ulion 586f07744c Support dump AF_FORMAT_AC3 format.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25125 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-21 08:55:41 +00:00
ulion 863a0e5c6f Remove an useless conditional suggested by Emanuele Giaquinta.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25035 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-13 15:08:17 +00:00
ulion f0ae640bf0 Remove useless definition.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25022 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-11 13:09:09 +00:00