Commit Graph

308 Commits

Author SHA1 Message Date
attila a4ac1dc9a4 add option to select mixer channel
patch by Catalin Muresan <catalin.muresan@astral.ro>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11838 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-24 11:53:52 +00:00
henry 70162b5ef8 ALSA 1.x audio out driver
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11776 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-11 17:07:32 +00:00
attila c27b831927 use -mixer with alsa9
patch by Roland Kuhn <rkuhn@e18.physik.tu-muenchen.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11765 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-10 09:10:52 +00:00
diego 0254ba85f5 URL updated.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11751 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-05 21:49:23 +00:00
diego 6445f83deb occured --> occurred typo patch by Clinton Roy <croy@dstc.edu.au>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11679 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-24 22:00:51 +00:00
attila 5cd067e6a0 This patch contains bugfixes for the esd audio output driver that I
uncovered while trying to send sound to a remote esd server over a
wireless (11 mbs, just enough to handle to sound) link.

First, the sound was full "ticking" sounds.  I found a bug that
prevented the "send the remainder of this block" code from ever being
called - so large chunks of audio were simply being ignored.  Fixing
this bug removed the "ticking" from audio streams.

Fixing this bug, however, uncovered another problem - when the socket
buffer was full, doing a blocking write to finish the buffer would take
far too long and would turn video into a chunky mess.  I'd imagine this
blocking write would be fine for an audio-only stream, but it turns out
to hold up the video far too much.

The solution in this patch is to write as much data as possible to the
socket, and then return as soon as possible, reporting the number of
bytes actually written accurately back to mplayer.  I've tested it on
both local and remote esd servers, and it works well.

Patch by Benjamin Osheroff <ben@gimbo.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11620 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-10 12:19:13 +00:00
joey 7afe24f691 original config:
> ao_data.bps=channels*rate;
> if(format != AFMT_U8 && format != AFMT_S8)
>   ao_data.bps*=2;

fallback config, before patch:
> ao_data.bps=ao_data.channels * ao_data.samplerate;

since we forced the format to S16_LE in fallback, we should double bps
to be consistent with an original config of the same settings.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11512 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-23 17:04:19 +00:00
diego 34911f6570 A-V sync fix by Timo Kanera <timo@kanera.de>.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11324 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-30 00:08:06 +00:00
attila ffb529e4eb 64bit types fix by a unkown mandrake 64bit expert
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11271 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-26 13:43:30 +00:00
gabucino fadce2d781 many small typo and grammar fixes
Based on Bernard Leak's mail <bernard 4t brenda-arkle.demon.co.uk>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11001 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-04 17:29:08 +00:00
attila 81e60cd6bb patch from Pierre Lombard <p_l@gmx.fr>
If the  sound channel is already  busy the async open  fails and returns
-EBUSY. There's no need to try to open it synchronously as it will block
mplayer till the sound channel is released.

(Granted there's  a very slight  chance your  sound device happen  to be
freed between those two calls but it's not the common case).

The behavior is changed by this oneliner to match the ao_oss behavior
(disable sound if the sound device is busy).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10899 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-21 09:49:05 +00:00
alex 39bdf999e9 IRIX support by Timo Kanera <timo@kanera.de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10839 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-07 18:15:47 +00:00
alex db4bf6023c 100l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10660 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-18 13:39:07 +00:00
joyping 9646f76179 no channels moving, autosubdievice, nonsupported fix by Vladimir I. Umnov <uvi@ezmail.ru>, removed braindeaded startup message
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10624 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-15 18:02:24 +00:00
alex 381b2109c6 1000l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10606 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-14 01:25:42 +00:00
alex c0298b66cd Set close-on-exec after newer open (in reset func). Patch by Andriy Gapon <agapon@cv-nj.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10601 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-13 21:04:15 +00:00
alex 31d2778fc6 better pause mechanism and faster uninit support by Vladimir I. Umnov <uvi@ezmail.ru>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10515 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-03 17:54:35 +00:00
alex 64885ae175 removing my (non-working) email address
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10367 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-03 20:07:54 +00:00
attila 55d8bdddb3 fix bps calculation when resampling,
patch by Marcus Comstedt <marcus (at) mc.pp.se>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10326 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-06-22 21:29:15 +00:00
alex ca78cf2743 -ao alsa9:hw:0,0 fix by Wojtek Kaniewski <wojtekka@bydg.pdi.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10259 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-06-08 04:03:59 +00:00
alex 177619f50f esd:server and esd latency support by Andrew Williams <andrew.s.williams@adelaide.edu.au>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10214 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-05-30 18:15:59 +00:00
alex 13fd5a7fca do it the standard way (tm)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10160 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-05-23 12:37:58 +00:00
alex c911f58ae6 cleanup/cosmetic patch by the author :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10153 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-05-22 16:12:54 +00:00
alex ecf10a4138 Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10148 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-05-21 21:15:46 +00:00
faust3 b28f1fb6e5 10l remove unused global
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10107 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-05-16 13:06:37 +00:00
ranma e6c118b982 Correct dumping hint (vc dummy faster than null).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10078 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-05-05 23:43:30 +00:00
alex d38968bd0e 10l to arpi with commit r1.12, noticed by Daniel Mario Vega <dv5a@dc.uba.ar>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9671 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-23 18:19:08 +00:00
alex d65c8518de 64bit libao2 fix by Jens Axboe <mplayer-dev@kernel.dk>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9634 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-21 16:42:50 +00:00
faust3 5ae779673c fix -loop problem
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9590 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-15 10:11:36 +00:00
henry ff88b3588b replace snd_pcm_drain with snd_pcm_drop
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9588 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-14 20:36:26 +00:00
ranma d5d89cca6a Fix small memleak in control().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9584 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-14 17:19:19 +00:00
arpi d06f9b725e 100l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9412 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-12 23:26:12 +00:00
arpi 7a35f528d1 The "initialize wav header with infinite lenght" broke the
post-recording fixup by changing the initialisation value of
data_length.  This fixes it.
based on patch by Olivier Galibert <galibert@pobox.com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9278 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-04 18:22:43 +00:00
arpi 0adfd9ae76 hwac3 fix
bugrep & testing by Stefan Baehre <ste.ba@gmx.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9266 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-03 23:30:27 +00:00
arpi 32ed76c8c4 temporary 'inifinte' length disabled (commit r1.13 reversed) due to user
compalints


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9224 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-02 16:34:54 +00:00
arpi ca0263659f compiler warning fixes patch by Dominik Mierzejewski <dominik@rangers.eu.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9218 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-02 02:42:59 +00:00
arpi 2b8643963c double free(), found by Olivier Galibert <galibert@pobox.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9157 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-29 12:22:00 +00:00
arpi 23015ad574 nice 10l bug, found by Balatoni Denes <pnis@coder.hu>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9142 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-28 17:25:53 +00:00
arpi 40789473d2 When the file is not finished to be written,
it has a temporary length of 0. It is more logical to
write an infinite length. (sox does this)
patch by Alain Daurat <daurat@tiscali.fr>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9027 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-19 16:49:02 +00:00
arpi a555841ab1 10l :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8980 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-18 01:06:05 +00:00
filon c7c41db7ca Workaround for returning very litte buffer space.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8875 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-10 18:28:18 +00:00
arpi a83c899996 10l
noticed by Joe Barnett <sanchezthecactus@yahoo.com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8849 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-09 09:27:51 +00:00
colin c619dbbb5b (nicer) endianness fix for every plugin except pl_format
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8742 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-03 15:12:18 +00:00
colin 9b483e615e trivial endianness fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8741 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-03 14:51:49 +00:00
colin 54eac2e3cf trivial bigendian fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8740 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-03 14:49:02 +00:00
diego b5d25351fe Rearrange the vo and ao driver order to prefer the native drivers and give
a better out of the box experience on Cygwin.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8730 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-03 05:10:44 +00:00
faust3 9a7aac86cd 10l fixes sync?
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8658 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-30 13:52:29 +00:00
rathann 84834e9d34 Added/reordered #includes to silence warnings about "implicit declaration".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8624 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 18:51:10 +00:00
arpi bd814ee879 ao_oss was not using the channel & format returned by the soundcard
for ao_data.bps calcualtion - hence fscked up av sync if soundcard didn't
support a number of channels or audio format.

patch by Balatoni Denes <pnis@coder.hu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8604 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 13:45:04 +00:00
arpi 2e399f394d DVB-HEAD (aka. NEWSTRUCT) detection & support
patch by Dimitrios Dimitrakos <mail@dimitrios.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8595 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 12:04:58 +00:00