Commit Graph

680 Commits

Author SHA1 Message Date
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
ulion 97e52ed6fd Indent fix for last change.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25019 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-11 02:58:45 +00:00
ulion 8fef9b8820 Support mute when passthrough to digital output.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25018 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-11 02:54:57 +00:00
ulion 894000c434 Fix dead lock when changing and restoring stream format for digital output,
replaced with lockless code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25008 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-10 02:07:34 +00:00
ulion 153e47522c Add include to fix warning:
ao_macosx.c:899: warning: implicit declaration of function 'gettimeofday'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24970 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-05 12:02:21 +00:00
reimar 11e44a3936 Remove idiotic check that would always be false
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24951 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-03 10:46:15 +00:00
reimar 2de070ff95 Change parsing to allow host == NULL and sink != NULL
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24949 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-03 10:42:23 +00:00
reimar f4f7560a1e Simplify argument "parsing"
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24948 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-03 10:37:22 +00:00
reimar a44c9616a8 Make sink variable local, it is only used in one place
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24947 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-03 10:35:03 +00:00
reimar 4d8266c739 Add missing ao_pulse.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24810 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-18 13:36:59 +00:00
reimar 855b2427e9 Replace Polyp- by PulseAudio output.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24809 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-18 13:34:26 +00:00
nplourde 38920cc4d1 bugfix for ao_macosx last dts passthrough patch, patch by Ulion, ulion2002 gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24769 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-13 12:14:24 +00:00
nplourde 3ec7b533fd Add support for AC-3/DTS passthrough.
patch by Ulion, ulion2002 gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24762 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-11 02:00:05 +00:00
diego c8ae1836e6 cosmetics: misc typo fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24615 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-25 16:34:23 +00:00
uau 50e46d7681 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.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24610 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-24 21:49:58 +00:00
reimar 455de9ca05 ao_mpegpes does not support S16_LE format, do not claim it does!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24542 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-16 09:16:45 +00:00
diego 59d308823c warning fix:
ao_mpegpes.c: In function 'init':
ao_mpegpes.c:230: warning: label 'retry' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24376 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-09 09:44:13 +00:00
ben b61b018062 v4l2 audio/video outputs for linux 2.6.22+ kernels (outputs formerly known as ivtv)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23925 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-29 19:20:55 +00:00
reimar 7be3e8694b Somewhat hackish fix for A-V desync with ao_oss and frame stepping:
send 0-samples according to the amount of data lost during pause.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23829 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-19 19:15:59 +00:00
diego b000a6a519 ISO8859-1 --> UTF-8
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23754 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-09 19:50:36 +00:00
diego 3e9e4acd8d Do not use leading underscores in multiple inclusion guards, they are reserved.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-02 22:34:45 +00:00
reimar f0ca74bd86 Fix r23353, it broke ao_sun on non-BSD due to accidentially removing
a return ao_data.outburst;


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23613 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-23 18:16:14 +00:00
reimar 5d02058b47 Do not use fast_memcpy for small size copy, esp. when the size is constant
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23476 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-05 15:09:49 +00:00
reimar 6a09e8e2ed Replace implicit use of fast_memcpy via macro by explicit use to allow
for future optimization.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-05 14:27:54 +00:00
diego 5edd9af248 Remove some unused variables, patch by timwoj ieee org.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23399 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-28 08:42:35 +00:00
reimar 29362964bb Move common ioctl outside of ifdef
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23354 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-20 12:20:03 +00:00
reimar 2764ff21db Clean up some unused code and #ifdef mess in ao_sun.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23353 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-20 12:15:16 +00:00
reimar 31a82e6b0e Implement flushing of audio data. Fixes bug #754.
Based on patch by Sergey Svishchev (svs ropnet ru).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23352 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-20 12:05:16 +00:00
reimar 02424fa21f Remove unused code, if it is ever needed it can be recovered from history
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23350 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-20 08:15:27 +00:00
reimar 4e411b9089 Mono audio should be supported by NAS, too.
Patch by Erik Auerswald {auerswal -at- unix-ag <dot> uni-kl de}


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23024 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-19 16:28:59 +00:00
diego 5519d98983 cosmetics: Fix indentation, reorder some lines for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22549 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 21:55:23 +00:00
diego 60b39e2786 Give more descriptive names to the source and library variables and split
between common, MPlayer-specific and MEncoder-specific parts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22546 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 12:10:57 +00:00
cladisch d091c1165b When setting the non-audio bit for hwac3 output, just try to set the
AES0 parameter in the device name instead of poking around inside ALSA's
configuration structures.  This means that the non-audio bit will be set
even if the user-specified device name tries to clear it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22184 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-09 19:49:31 +00:00
rathann 45defa1aa0 Fix a few gcc warnings, approved by Diego and Reimar.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22160 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-05 23:46:08 +00:00
reimar b09c72b9d3 Support for AOPLAY_FINAL_CHUNK in ao_sdl.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22122 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-04 10:01:13 +00:00
diego 4f9a4a72c9 Fix FSF address and otherwise broken license headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21995 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-22 08:02:06 +00:00
diego 26106f7551 Amiga OS 4 needs a large sample size.
patch by Andrea Palmatè, andrea amigasoft net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21749 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-23 23:26:13 +00:00
reimar cbb2590c88 OpenAL volume control
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21586 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 22:45:32 +00:00
reimar 7d4e8a36bb Support OpenAL headers in OpenAL/ instead of AL/ and OpenAL on MacOSX in general.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21572 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 14:07:08 +00:00
reimar 121bab971c Fix a compiler warning
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21566 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 01:10:53 +00:00
reimar eb2d97e38a Set frequency and correct frequency getting
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21565 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 01:08:32 +00:00
reimar 2a2d39f0ed Remove a disabled and completely outdated sample rate mismatch warning.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21563 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 00:21:35 +00:00
reimar 134a537a76 Improve OpenAL speaker positions a bit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21546 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 12:14:14 +00:00
reimar 26bf51077d Half-properly set up OpenAL position stuff
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21543 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 11:45:41 +00:00
reimar 18004d2d98 Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21523 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 11:58:07 +00:00
diego cac6c0eea2 Remove bswap.h, use libavutil/bswap.h instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 15:02:45 +00:00
nplourde 3058b1f8ac adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21368 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 23:05:45 +00:00
diego dc2be42703 Merge common parts of all Makefiles into one file included by all.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21275 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 18:12:36 +00:00
reimar 329ba64c0a le2me_32 is no longer a macro on PPC, and in general does not have to
be, thus using it like a constant is incorrect.
Move wavhdr initialization to the code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21266 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 13:19:32 +00:00
diego 27b0177662 Remove superfluous comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21222 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 16:12:36 +00:00
diego cf4bf03dc2 Unify dep/depend targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21096 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:18:01 +00:00
kraymer 7043e4a0a7 MSGTRs for ao_alsa.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20780 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 14:52:33 +00:00
diego c24e344fae typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20759 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 21:09:10 +00:00
reimar 40f9cdbdd8 Implement AOPLAY_FINAL_CHUNK support for dshow and win32 out.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20256 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-15 20:48:26 +00:00
diego fcd45c5111 slight overall verbosity reduction
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20191 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 22:24:19 +00:00
diego 77347df36f Remove bogus #ifndef WORDS_BIGENDIAN.
patch by Emanuele Giaquinta, e.giaquinta glauco it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20026 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-04 08:46:32 +00:00
cladisch bcebc89ef4 When the hardware sample format is AC3, do not force using an hardcoded
device name.

The setting of the non-audio bit is now done by changing the default
value of the AES0 parameter in the ALSA configuration structures. This
works with user-specified devices, too.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19895 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-18 16:58:21 +00:00
cladisch ec56167e11 When one of the PCM configuration function in init() fails, abort
immediately instead of continuing with the remaining calls that would
fail anyway because the device or some variable wasn't properly
initialized in this case.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19893 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-18 16:29:27 +00:00
faust3 3624850220 disable multichannel mode, it never worked reliable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19841 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-15 16:26:25 +00:00
diego 66b1d0d001 The FSF changed postal address.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19620 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-01 12:11:11 +00:00
nplourde be5863dca4 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19433 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-18 01:19:19 +00:00
diego b02e7924b9 Move all internal -I parameters to the front of CFLAGS to avoid using external
header files that happen to have the same name as internal ones.
based on a patch by Vladislav Naumov, vladislav.naumov **at** gmail **dot** com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19426 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-17 17:19:56 +00:00
uau 2ad89c5956 Move mpeg aos to the end of the autodetection list. At least mpegpes
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
2006-08-16 20:04:43 +00:00
ivo 51d4c32446 replace calls to perror() with calls to mp_msg()
this will shut up mplayer -realy-quiet. ao_mpegpes is the first ao that is
tried and will almost always fail (unless you have the right hardware)



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19368 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-11 17:10:57 +00:00
ben 6e33f2b9ad added audio output for ivtv cards
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19229 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-28 21:36:03 +00:00
nicodvb 8154069fad if HAVE_DVB isn't set don't fall back to outputting audiograb.mpg by default, fail instead
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19227 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-28 21:15:31 +00:00
nicodvb b41f28a54f include sys/poll.h only when HAVE_DVB[_HEAD] is set
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19220 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-28 15:40:05 +00:00
diego 22b5b6d0f5 Unify include paths in the build system, part I.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19195 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-27 10:08:17 +00:00
nicodvb 01aa3fd1be split the incestous intercourse between ao_mpegpes and vo_mpegpes; now the devices can be used separately
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19189 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-26 21:40:43 +00:00
ben f5b338b852 use mpeg packetizer helpers for sending lpcm packets
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19169 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-23 10:10:06 +00:00
ben 0c540410fe use new mpeg_packetizer helpers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19156 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-22 10:39:00 +00:00
diego f7d4dd174b OPTFLAGS already includes EXTRA_INC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19042 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-12 17:58:07 +00:00
diego 02a3a41923 Use only one global config.mak file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19039 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-12 17:28:14 +00:00
diego e364249f21 Remove unused variables, patch by Stefan Huehner, stefan ##at## huehner org.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18981 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-09 16:01:36 +00:00
reynaldo 03485211a9 two variables are made static, one of them additionaly modified to const char*. Patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18971 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-09 03:50:47 +00:00
reynaldo 96565761f1 make prefix const. Patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18970 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-09 03:42:35 +00:00
reynaldo f50e7ffca9 modifies function declarations without parameters from ()
to the correct (void). Only files in libao2 are affected.

patch by Stefan Huehner stefan AT huehner-org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18920 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-06 04:30:19 +00:00
reynaldo 8f65768bf2 rm unnecesary casts from void* - part 4
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18890 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-03 13:21:54 +00:00
pacman b483d64bc0 Respect AOPLAY_FINAL_CHUNK
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18846 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-28 19:22:27 +00:00
reimar 6e809b6f52 respect AOPLAY_FINAL_CHUNK and do not discard samples read from buffer
on underrun.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18812 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-25 09:02:47 +00:00
reimar 6811f8c042 remove unused variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18811 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-25 08:53:13 +00:00
uau bd4a9d25bf Rewrite audio EOF handling logic fixing some problems that could cause
truncation of output, set flag AOPLAY_FINAL_CHUNK in play call to tell
ao there will be no more data beyond what's in current buffer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18738 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-16 21:52:25 +00:00
diego 4b64ef7e8e Remove now obsolete .cvsignore files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18556 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-02 11:24:33 +00:00
diego 5115aa181d Only set the default output filename when it was not passed on the command
line.  Noticed by Corey Hickey.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18501 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-14 10:21:56 +00:00
rathann 9a6953a891 Fix:
ao_polyp.c:74: warning: implicit declaration of function ‘strcspn’
ao_polyp.c:79: warning: implicit declaration of function ‘strncpy’


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18491 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-13 21:01:05 +00:00
diego 3de60f8ff7 Move setting the output filename after the suboption parsing, otherwise it
cannot take the suboptions that were set into account.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18489 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-13 19:04:39 +00:00
reynaldo 3a406e94d7 Get ride of the several if(identify) messy lines and rearangment of some of 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
2006-04-24 07:20:34 +00:00
reimar 86b0871127 -ao pcm:fast suboption for faster-than-realtime dumping
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18093 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-14 13:18:35 +00:00
cladisch e7941a0ef3 Add workarounds for old prerelease versions of alsa-lib 0.9.0 that did
not allow reading the buffer boundary value.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18010 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-31 09:28:37 +00:00
reynaldo bf25812a43 Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17995 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-30 06:40:58 +00:00
diego 37221f9b74 printf --> mp_msg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17934 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-24 08:21:40 +00:00
diego eebf08b978 Convert all if(verbose>X) to mp_msg_test calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-24 08:12:03 +00:00
cladisch b263a6618e To avoid a bug in ALSA's rate plugin that causes spurious overruns, try
to disable it so that mplayer's resampler is used.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17850 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-13 10:50:37 +00:00
cladisch 6bab259faf Do not try to count hardware sound cards because there might be none
when using a software plugin for JACK/OSS/Polypaudio/Bluetooth/etc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17849 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-13 10:49:12 +00:00
cladisch 6ccd999a89 Output error messages from the ALSA library through mp_msg() instead of
the default stderr.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17692 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-27 10:09:05 +00:00
cladisch 434f6b2347 Show the actual ALSA version instead of the version mplayer was compiled
with, if possible.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17691 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-27 10:06:27 +00:00
reimar 86e6ef0ca1 include stdlib.h and stdio.h, they tend to be useful :-)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17645 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-18 12:45:00 +00:00
aurel acf99ed75b fix compilation without openal
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17635 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-16 22:35:04 +00:00
reimar 8424c24317 OpenAL audio support, actual output is mono-only (no positioning yet).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17634 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-16 20:45:25 +00:00
cladisch 7673cbf6a7 Fix the error handling in the play() function: add a handler for EINTR,
improve the reporting of other errors, and don't try to call
snd_pcm_writei() repeatedly when it aborts after a partial write due to
an error.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17622 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-13 11:48:29 +00:00
cladisch 7d319f4b75 This changes the software parameters to be more compatible with the
behaviour of the OSS driver.  This implies that underruns are not longer
reported.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17621 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-13 11:43:25 +00:00
cladisch 0fc0814fcd Using non-blocking writes makes sense when the program wants to do other
things instead of waiting for the device to become ready.  However, just
calling snd_pcm_wait() is identical to blocking mode, so we can just as
well remove support for non-blocking writes.

Besides, the waiting code was never actually used because play() is
never called with more data than reported by get_space().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17620 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-13 11:38:12 +00:00
cladisch 1328f3731c Remove the now superfluous mmap suboption.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17619 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-13 11:17:43 +00:00
cladisch 7f9397276b After removing play_mmap(), the play() function just unconditionally
calls play_normal().  This indirection is now superfluous.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17618 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-13 11:16:29 +00:00
cladisch cc8359e4e8 This patch removes mmap support because it doesn't have any benefit.
Directly accessing the sample buffer makes sense only when the samples
can be constructed in-place.  When the samples are just copied from
another buffer (as is the case with libao2 drivers), the code to copy
those samples is just a reimplementation of snd_pcm_writei(), so we
could as well use that function.

Besides, the current mmap code does not work except in the most simple
cases: it claims to support non-interleaved and complex sample formats,
but treats them the same as interleaved formats and writes to the wrong
memory location.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17617 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-13 11:15:25 +00:00
cladisch ddfe8e253e Small fixes: make all global variables static, remove some unused
variables, and remove the unused dir parameter from set_xxx_near()
calls.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17576 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-10 09:28:08 +00:00
cladisch 18ca43b048 Remove a call to snd_pcm_prepare() because snd_pcm_hw_params() does it
automatically, and remove a call to snd_pcm_drop() because
snd_pcm_close() does it automatically.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17575 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-10 09:26:11 +00:00
cladisch a25341464c Simplify get_delay(): we don't need to get the complete PCM status but
can call snd_pcm_delay() directly.

To avoid the audio device appearing to be running too fast after an
underrun, ignore any samples that were lost in an underrun.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17574 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-10 09:24:48 +00:00
cladisch 689c7b37a2 Fix get_space(): we don't need to differentiate between the various PCM
device states, and there is no need to avoid returning a positive value
less than 1024.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17573 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-10 09:21:17 +00:00
cladisch 508d589e21 This adds support for more sample formats (U32, float BE, mu/A-law).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17572 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-10 09:20:08 +00:00
cladisch 7bb5f4e138 This replaces the hardcoded numbers for the sample format widths with a
call to snd_pcm_format_physical_width().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17571 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-10 09:18:27 +00:00
rathann e7db4ccf1a Patch by Stefan Huehner / stefan % huehner ! org \
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
2006-02-09 14:08:03 +00:00
diego 89d549f984 Make clean/distclean behave uniformly in all directories.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17489 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-27 00:06:42 +00:00
rathann 2601de4120 massive attack: mp_msg printf format fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-12 20:04:36 +00:00
al fa2d1c9a69 - move our setenv() fallback implementation to osdep
- assert that the override param is nonzero (zero is not implemented)
- correct return value type to int

based on a patch by Diego
fixes bugzilla bug #342


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17246 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-26 03:16:48 +00:00
wanderer dd75eef3f3 use snd_mixer_selem_set_playback_switch when muting ALSA, patch by Matthias Lederhofer <matled -at- gmx dot net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17195 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-15 17:50:29 +00:00
rathann 637ef4ab74 fix
ao_alsa.c:115: warning: suggest parentheses around assignment used as truth value


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17098 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-05 01:31:03 +00:00
ranma c01054baac Link was a bit dated (but still working :-))
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17065 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-29 19:53:05 +00:00
diego 491ff4b705 -aop is long obsolete.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17059 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-28 23:43:24 +00:00
diego 56770b6eef Unify include paths, -I.. is in CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17021 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-19 14:35:45 +00:00
joey 35d0962444 DirectSound's GetVolume and SetVolume use 100ths of decibels and range from -10,000 to 0.
MPlayer uses a linear intensity value between 0.0 and 100.0.
This patch converts the values properly rather than simply linearly mapping the range.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16973 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-11 03:07:01 +00:00
albeu 1f1fc11b84 Allow setting the mixer per instance so one can fallback between
several oos device and still have correct mixer settings all the
time.
The sytax is now: oss[:dsp_device[:mixer_device[:mixer_channel]]]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16960 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-10 09:02:56 +00:00
diego 8723503a71 ao_macosx is a native audio output driver and should thus have priority
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
2005-10-11 23:07:53 +00:00
reimar 42f5436396 General bug fixes, like missing includes, formats that were incorrectly
claimed to be supported etc. Patch by dega (dega quickclic net)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16668 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-04 22:23:51 +00:00
henry 99bd394969 reordered bps calculation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16310 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-25 21:46:32 +00:00
henry 4b40fd60f0 set the nearest number of channels, return(0) upon errors
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16309 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-25 19:57:32 +00:00
reimar 7ddba02880 name suboption for jack to set client name
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16254 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-18 09:40:59 +00:00
reimar 252d940dd8 Set block_align in header, seems MatLab can not handle files without.
Patch by Pedro Larroy Tovar (pedro at larroy dot com).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16244 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-17 11:27:11 +00:00
reimar 219578d73d reset estimation also on too negative diff
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16141 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-28 17:11:22 +00:00