Commit Graph

473 Commits

Author SHA1 Message Date
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
reimar 897390ed1e improved audio delay estimation, supposed to help make the video smoother
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16105 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-26 10:47:29 +00:00
nplourde f8f3683a37 remove delay when setting audio volume
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16015 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-19 14:36:13 +00:00
alex a1af27beb4 QUERY_FORMAT support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15899 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-03 11:38:35 +00:00
reimar 6dad56fda6 avoid hang when playing more than one file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15869 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-30 13:25:08 +00:00
nplourde 0bbc7905c9 more general ao_macosx cleanup. Patch by Alexander Strange <astrange@ithinksw.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15854 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-29 18:17:19 +00:00
gpoirier 9dd8f241ac adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM en DASH directo POUM net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15790 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-20 23:07:35 +00:00
ranma 2098665b8d Be more patch-friendly
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15773 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-19 22:52:55 +00:00