1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-17 04:15:13 +00:00
Commit Graph

568 Commits

Author SHA1 Message Date
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