RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-30 19:22:11 +00:00
Code Issues Releases Wiki Activity
29,844 Commits 41 Branches 86 Tags 148 MiB
2b93a48ac8
Commit Graph

680 Commits

Author SHA1 Message Date
tack
3c2afd6786 Add support for 8 channel audio. 
Where 8 channel support is non-trivial (e.g. ao_dsound), at least ensure we
fail gracefully.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29868 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-11-10 00:45:19 +00:00
cladisch
59b6e1393d fix calculation of ao_data.bps for sample formats with more than 16 bits 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29750 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-10-05 07:42:02 +00:00
reimar
a79706df46 Make the ao_alsa play function always process a multiple of ao_data.outburst 
except for the last chunk.
Should fix high CPU usage reported e.g. here: http://bugs.gentoo.org/show_bug.cgi?id=286020


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29748 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-10-02 16:49:41 +00:00
reimar
790e41cf8f The suboption parser now takes a const options list, so mark them all const. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29628 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-09-02 11:33:37 +00:00
cladisch
f17ed52432 Use a buffer of about half a second, instead of sizing it to have 
a constant number of frames.  This improves the behaviour at very
small or large sample rates, and gets rid of lots of obsolete code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29549 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-08-24 07:32:25 +00:00
reimar
54af60865f OpenAL: untested support for 8-channel audio. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29542 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-08-19 16:03:05 +00:00
reimar
11e641f48f Change ao_dart to use AVFifoBuffer instead of its own fifo implementation, too. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29540 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-08-19 09:01:37 +00:00
reimar
3b6b050e14 100l, av_fifo_generic_read does not return anything useful, so ignore its 
return value and return len instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29481 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-08-08 08:17:35 +00:00
cladisch
806d0c21c2 Do not leak the mixer handle if setting of a volume fails. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29478 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-08-06 09:43:10 +00:00
diego
e5751ced4f Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29443 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-07-26 19:53:00 +00:00
cladisch
de3d544c43 Use the correct OSS format, where possible, for mplayer's packed 24-bit 
format (AFMT_x24_xE would be 32-bit aligned).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29438 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-07-24 10:35:22 +00:00
cladisch
dc8bb7837a Use correct ALSA sample format for 24-bit samples packed in three bytes. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29434 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-07-21 08:20:22 +00:00
iive
968a51cfef Handle 24bit audio formats natively by ALSA. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29428 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-07-19 10:26:48 +00:00
reimar
dbe4e49033 Add a hack to detect when we are writing into a Windows pipe since the fseek 
incorrectly does not fail like it should.
This ensures we will not incorrectly append the file header at the end.
Based on patch by Zhou Zongyi [zhouzongyi at pset.suntec.net]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29311 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-05-16 13:59:53 +00:00
diego
6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-05-13 02:58:57 +00:00
diego
d9ded9284c Add missing 'void' to parameterless function declarations. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29254 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-05-04 17:35:26 +00:00
diego
e3ec5b1fd3 Rename macosx audio output driver to coreaudio. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29251 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-05-04 14:53:47 +00:00
reimar
1ba8ea2d34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29243 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-05-03 20:57:37 +00:00
reimar
690714883e Simplify: use av_fifo_space 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29166 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-10 14:41:18 +00:00
reimar
fe9c8d60b4 Disable pause-hack from PulseAudio 0.9.15 on, it should be fixed. 
Patch Lennart Poettering [lennart poettering net] with documentation
update by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29160 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-09 20:20:00 +00:00
reimar
33645075f1 Split oversized of "argument" onto a separate line. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29159 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-09 20:10:35 +00:00
reimar
d1c4d6c7ef Also lock the mainloop when doing adjusting the volume for PulseAudio. 
Patch by Lennart Poettering [lennart poettering net]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29158 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-09 20:07:26 +00:00
reimar
a7e4ab04d7 Make sure waitop always unlocks the mainloop even if the operation could not 
be created.
Patch by Lennart Poettering [lennart poettering net]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29157 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-09 20:04:24 +00:00
reimar
45535aa89d Add forgotten "static" to new data_length variable in ao_pcm 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29037 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-22 14:28:13 +00:00
reimar
0d44f19d27 Whitespace-only cosmetics: use consistent indentation in ao_pcm.c 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29036 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-22 14:27:10 +00:00
reimar
412cddeb2c Print a warning if ao_pcm wrote more data than what can be specified in the 
WAV header (ca. 2GB currently) or if it can not update the header at all.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29035 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-22 14:23:07 +00:00
reimar
2c64a71a29 Do not call waveOutReset in uninit if you should wait till playing finishes, 
and retry waveOutClose if it fails due to still playing.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28918 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-09 19:15:20 +00:00
reimar
2853105459 Reuse libavutil fifo code instead of reimplementing it over and over. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28917 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-09 18:21:47 +00:00
reimar
54c1d83197 Make audio_out_* structs const so they end up in .rodata 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28859 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-06 19:58:16 +00:00
reimar
d6bf2e318e Make ao_info_t structs const. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28858 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-06 19:43:12 +00:00
reimar
77e48c6635 Use code that is actually thread-safe to calculate delay, free space etc. in ao_win32 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28857 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-06 19:23:24 +00:00
reimar
c73340f19a Cosmetics: get rid of trailing whitespace. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28856 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-06 19:10:54 +00:00
reimar
6067203cab get rid of full_buffers variable, if the check it is used for is triggered 
something is seriously wrong and the ao will not work right anyway.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28855 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-06 19:07:50 +00:00
reimar
6040a6f3ea Remove now unused buf_write_pos variable from ao_win32 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28854 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-06 18:53:29 +00:00
reimar
7ee7bd3d5b Always write full buffers in ao_win32, except for the last block. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28853 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-06 18:50:50 +00:00
reimar
79df4b2499 Use calloc instead of malloc+memset 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28852 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-06 16:27:31 +00:00
reimar
7c52124a2b The 8 bit per sample formats are unsigned on Windows, fixes playback with 
-af format=s8 for -ao dsound and -ao win32.
Patch by Zhou Zongyi [zhouzongyi (at) pset suntec net]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28850 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-06 13:22:48 +00:00
reimar
2f2b271649 Sleep based on get_delay in ao_win32 uninit instead of a loop. 
The loop for an unknown reason could rarely cause an endless loop.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28828 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-05 22:07:06 +00:00
reimar
8831008bb5 full_buffers and buffered_bytes must be volatile because they are used from 
different threads, hopefully this fixes an uninit hang.
The code still relies on luck for thread-safety though.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28811 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-05 12:25:10 +00:00
diego
23599b030c DART audio output driver for OS/2 by KO Myung-Hun, komh chollian net 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28775 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-01 11:36:39 +00:00
reimar
0ef6b6a546 Move resetting audio_info_t samples, eof and error in ao_sun.c to reset(), avoids 
duplication code from init() and fixes hangs after seeking.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28689 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-21 13:37:47 +00:00
reimar
0927ebeef7 Work around a PulseAudio bug that causes MPlayer to hang after unpausing. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28668 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-19 14:00:33 +00:00
reimar
0c6b3b8742 Set samplerate in reset also for AC3, and set it before the format in that 
case (no idea why, but it is done this way in init, so it is consistent).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28640 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-17 21:08:22 +00:00
reimar
8e90297698 100l, do 0-filling on resume (to avoid desync after pause) in ao_oss only when 
the we output a PCM format, not for e.g. AC3.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28614 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-16 18:38:54 +00:00
diego
390a1afef0 1) HAVE_SYS_ASOUNDLIB_H/HAVE_ALSA_ASOUNDLIB_H are defined to 0/1, 
not defined/undefined, use them accordingly.
2) Add ESD definitions to avoid undefined preprocessor directives warnings.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28397 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-30 23:21:23 +00:00
diego
c1cd81818a Add standard license headers. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28378 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-26 15:06:44 +00:00
reimar
4b5c66af76 Replace deprecated jack_client_new with jack_client_open. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28241 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-04 11:51:11 +00:00
reimar
d3825e4c8a Move several of the ao_nas int-to-string maps into .rodata 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28227 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-01 11:51:52 +00:00
reimar
6574e5da34 100l, reorder check for AC3 format to avoid a possible memleak 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28153 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-15 20:19:27 +00:00
diego
0864f92e7a Get rid of pointless 'extern' keywords. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-03 23:01:03 +00:00