github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-18 21:16:10 +01:00
Code Releases Activity
31,701 Commits 41 Branches 86 Tags 188 MiB
4c6e3ac01b
Commit Graph

775 Commits

Author SHA1 Message Date
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
Uoti Urpala
ebb541c655 Merge svn changes up to r28690 2009-02-21 17:39:30 +02: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
Uoti Urpala
186e5a998c Merge svn changes up to r28641 
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
 2009-02-18 01:45:36 +02: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
Uoti Urpala
ccf4d9e96c Merge svn changes up to r28403 2009-01-31 04:52:15 +02: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
Uoti Urpala
9bcd12fdf5 Merge svn changes up to r28310 
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
 2009-01-15 05:57:31 +02: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
Uoti Urpala
71b25cca76 Merge svn changes up to r28162 2008-12-19 00:29:24 +02: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
Uoti Urpala
f01f7f6259 ao_alsa: Sanity check get_space() return values better 
Sometimes after seek audio reset I see snd_pcm_status_get_avail()
return huge values. get_space() already had a check againt the value
being larger than the whole buffer; however since the unsigned value
from the ALSA function had been cast to signed by that point it was
interpreted as negative and the check didn't trigger. Use unsigned
instead to make the check reliable and ensure the return value is sane.
 2008-12-10 02:54:01 +02:00
Uoti Urpala
66cefd5f71 ao_alsa: If pause loses samples replace them with silence 
If the ALSA pause functionality is not available the driver has to
drop buffered samples when MPlayer calls pause(). Replace them by
playing a corresponding amount of silence in resume() instead of
shortening the overall audio duration.
 2008-12-08 22:36:06 +02:00
Uoti Urpala
8c144171bb Merge svn changes up to r28087 
Conflicts:
	command.c
	libao2/ao_ivtv.c
	libao2/ao_v4l2.c
	libmpcodecs/dec_video.h
	libvo/aspect.h
	libvo/sub.c
	libvo/sub.h
	libvo/vo_directx.c
	libvo/vo_macosx.m
	libvo/vo_quartz.c
	mp_core.h
	mplayer.c
	mplayer.h
	osdep/getch2.h
	osdep/timer.h
 2008-12-04 01:55:52 +02: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
Uoti Urpala
0301309425 Merge svn changes up to 27824 
Conflicts:
	cfg-common-opts.h
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libvo/x11_common.h
	mplayer.c
	stream/cache2.c
 2008-10-25 05:12:34 +03:00
diego
4d644f513c Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__. 
This avoids a pointless indirection that only obscures what is really done.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27761 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-13 16:23:55 +00:00
cehoyos
22bb046adc Replace numeric constants by their defines. 
Fixes icc warning #188: enumerated type mixed with another type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27738 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-09 17:08:47 +00:00
ranma
cb8c70d6c2 Fix "format '%d' expects type 'int', but argument 6 has type 'size_t'" warning. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27714 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-04 15:11:39 +00:00
ranma
68fa9667ec Make alsa resume after suspend to disk (would say 'file descriptor is in bad state' before this change) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27712 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-04 15:03:10 +00:00
Uoti Urpala
259ea9d703 Merge svn changes up to r27573 
Conflicts:
	libmpcodecs/vd_ffmpeg.c
 2008-09-10 23:59:08 +03:00
diego
3311a2ae9c Replace casual GPL notices by proper license headers. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27541 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-07 14:09:51 +00:00
diego
691a41a817 Replace casual GPL notice by proper license header. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27534 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-06 18:19:37 +00:00
Uoti Urpala
b56858342f Merge svn changes up to r27514 2008-09-03 10:16:30 +03:00
ranma
4445a58fd3 Fix 'cast from pointer to integer of different size' on 64bit architectures. Casting to long should work for 32bit and 64bit and not make a difference to the boolean operation (since 'format' is always 32bit (int) the upper 32bit of 'arg' won't matter, but the compiler should be happy now. Casting both to unsigned makes sure the compiler isn't messing things up by sign-extending 'format' to 64bit before masking) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27482 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-24 13:52:54 +00:00
ranma
7f26ceaa54 Handle AOPLAY_FINAL_CHUNK 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27481 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-24 13:36:04 +00:00
ranma
d5df440c7f fix compiler warnings 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27478 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-23 08:14:37 +00:00
diego
5a4496ca5d Work correctly with very small files where less than outburst is to be played. 
patch by Tobias Diedrich, ranma tdiedrich de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27467 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-15 17:14:53 +00:00
diego
511729a3a2 Use '#include <poll.h>' instead of '#include <sys/poll.h>'. 
It is the standard location as defined by the Open Group.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27463 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-14 15:54:53 +00:00
diego
20e0b5c831 100l: Rename missed preprocessor directives from a HAVE_ prefix to CONFIG_. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27462 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-14 15:48:11 +00:00
Uoti Urpala
9f7c6291a5 Remove special error message for -ao alsa1x and alsa9 
Those variants were removed in 2004. Remove the special handling of
those ao names and treat them like any other unrecognized ao name.
This removes a questionable exit_player() call.
 2008-08-12 14:57:18 +03:00
Uoti Urpala
8d5912e60d mpeg ao/vo drivers: Fix packet-writing helper function types 
Add missing 'const' to callback functions passed to
send_mpeg_pes_packet() / send_mpeg_lpcm_packet().
 2008-08-12 14:57:17 +03:00
Uoti Urpala
680703ecae ao_mpegpes: Remove declarations of unused functions 2008-08-12 14:57:17 +03:00
Uoti Urpala
f6dfaf26f8 Make various functions static 2008-08-12 14:57:12 +03:00
Uoti Urpala
17d3e4b36d Merge svn changes up to r27441 
Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h
 2008-08-08 02:13:09 +03:00
diego
024b6efdf1 Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x. 
Use it in all the places that checked for either ALSA 0.9 or 1.x.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27422 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-06 23:19:29 +00:00
diego
473e2824cb Rename all preprocessor directives related to Apple / Mac OS X. 
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27420 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-06 07:42:26 +00:00
diego
f83e779ee4 Rename some audio-output-related preprocessor directives. 
Switch them from a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27419 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-05 16:32:47 +00:00
diego
02135001b4 Change a bunch of video/audio-output-specific preprocessor directives from 
a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-03 15:21:40 +00:00
diego
52d358e3dc Set HAVE_DVB in configure when HAVE_DVB_HEAD is defined 
instead of doing in redundantly in DVB-specific files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27401 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-02 21:39:29 +00:00
diego
429bf7a9dc cosmetics: typo fixes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27400 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-02 20:35:29 +00:00
Uoti Urpala
04f3909a72 Merge svn changes up to r27374 
Conflicts:

	cfg-common-opts.h
	cfg-mplayer.h
	command.c
	configure
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpcodecs/vf_vo.c
	libmpdemux/demuxer.h
	libmpdemux/stheader.h
	mp_core.h
	mplayer.c
	stream/stream_radio.c
 2008-07-30 16:39:24 +03:00
diego
4b141479da Start unifying names of internal preprocessor directives. 
Replace all USE_ prefixes by CONFIG_ prefixes to indicate
options which are configurable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-30 12:01:30 +00:00
Uoti Urpala
2d4656e070 Merge svn changes up to r27332 2008-07-21 15:03:49 +03:00
reimar
6dfb85dc9e Our ALSA code needs alloca, so check for it in configure and include alloca.h 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27313 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-17 17:11:30 +00:00
Uoti Urpala
de560e8167 Merge svn changes up to r27123 
Conflicts:

	libmenu/menu_filesel.c
	libmenu/menu_pt.c
 2008-06-23 03:58:44 +03:00
corey
5eee4632d3 Add verbose messages about trying and searching for audio output drivers. 
Add messages showing why a specified audio output driver failed to be used.

Based on a patch from Bryan Henderson, giraffedata [[]] gmail :: com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27123 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-22 19:25:54 +00:00
Uoti Urpala
af3fcdf2de Merge svn changes up to r27025 
Conflicts:

	command.c
	libvo/vosub_vidix.c
	libvo/vosub_vidix.h
	mplayer.c
 2008-06-07 19:57:57 +03:00
diego
92f79295d2 Use standard license header, merge changelog into license header and TODO. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26994 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-06 00:45:35 +00:00
Uoti Urpala
d5c868325c Merge svn changes up to r26979 
Most of the conflicts are trivial.

Conflicts:

	Makefile
	cfg-mplayer.h
	input/input.c
	libmenu/vf_menu.c
	libmpcodecs/dec_video.c
	libmpcodecs/vf_expand.c
	libmpcodecs/vf_vo.c
	libmpdemux/demux_mkv.c
	libmpdemux/demuxer.c
	libmpdemux/demuxer.h
	libvo/vo_directfb2.c
	libvo/vo_gl.c
	libvo/vo_winvidix.c
	libvo/vo_xv.c
	libvo/vo_xvidix.c
	libvo/vo_xvmc.c
	libvo/x11_common.c
	mplayer.c
	osdep/timer-linux.c
	stream/cache2.c
 2008-06-04 08:10:48 +03:00
diego
bc0058c63e cosmetics: Remove pointless parentheses from return statements. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26789 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-16 09:31:55 +00:00
Uoti Urpala
a41db36b22 Merge svn changes up to r26783 
Conflicts:

	Makefile
	common.mak
	configure
	libmpcodecs/vd_ffmpeg.c
	libmpdemux/demux_mkv.c
	libvo/vo_xv.c
	mplayer.c
 2008-05-15 21:19:35 +03:00
diego
b10c35e0ed Use standard license headers with standard formatting. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26775 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-14 18:02:27 +00:00
reimar
c8b5921d06 Avoid dependency on newer pulseaudio version. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26681 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-07 22:46:50 +00:00
Uoti Urpala
267a3f4c9c Merge svn changes up to r26680 
Conflicts:

	Makefile
	configure
	osdep/timer-darwin.c
 2008-05-07 13:15:37 +03:00
reimar
1758d95819 Remove a comment that makes no longer sense (since quite some time actually) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26637 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-01 16:59:37 +00:00
reimar
0f5ee4b7bd Support 32 bit float and integer formats in ao_pcm.c 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26636 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-01 16:58:52 +00:00
reimar
71247a97b3 Add support for 32 bit format to ao_pulse. 
Based on patch by James Warden [warjamy yahoo com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26635 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-01 16:51:25 +00:00
reimar
e1e2527cd4 Make ao_pulse fall back to s16le format instead of just failing. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26634 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-01 16:47:54 +00:00
Uoti Urpala
0e757bf9da Remove _s/_st suffix from some struct names 
Since the names are always used after the keyword "struct" having a
suffix as in "struct demuxer_st" is almost completely pointless.
 2008-04-25 03:34:22 +03:00
diego
2bcda50ffe Merge libao2/Makefile into top-level Makefile. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26507 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-23 09:33:51 +00:00
reimar
9623100d13 reset() should not senselessly close and reopen 
the device but instead just call flush_audio()


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26345 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-07 17:39:41 +00:00
reimar
885709eadd AUDIO_DRAIN makes no sense directly after opening 
the device, but it should be done in uninit.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26344 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-07 17:32:44 +00:00
diego
f9da8542dd Introduce a separate definition for Mac OS X coreaudio support. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26240 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-03-15 08:54:21 +00:00
diego
2922e18092 Merge two #ifdefs. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26134 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-03-01 09:45:38 +00:00
diego
a09376d67b cosmetics: reindent, detabify 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26133 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-03-01 09:04:00 +00:00
diego
4485a60c38 Remove duplicate extern declaration. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26132 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-03-01 08:56:28 +00:00
diego
8efb2fa21c Add MPLAYER_ prefix to multiple inclusion guards. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-22 09:09:46 +00:00
diego
77eb726c3d Remove pointless #ifdefs around extern declarations. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26039 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-20 08:51:53 +00:00
diego
835c654bb0 typo fix: inited --> initialized 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-14 14:23:55 +00:00
reimar
6921ab9e24 ao_functions_t should be const, part 1 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25945 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-01 20:11:14 +00:00
reimar
344013f8c7 Remove unused variable. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25942 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-30 23:49:36 +00:00
reimar
c87beafb2c Fix get_space calculation to always leave some space, esp. for the currently playing buffer. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25941 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-30 23:48:48 +00:00
reimar
c470666c57 Change code to also work with different outburst sizes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25940 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-30 23:39:01 +00:00
reimar
c8c416c516 Reduce number of UnqueueBuffer calls 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25939 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-30 23:37:30 +00:00
reimar
1a976d453f alSourceRewindv seems to be broken in particular in Creatives Windows-Implementation, 
use alSourceStopv instead.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25938 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-30 22:28:41 +00:00
reimar
7172339ff9 Write functions used by send_mpeg_*_packet may _not_ modify data 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25701 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-12 16:05:04 +00:00
reimar
8c38419374 Make code slightly less confusing to me 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25678 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-11 20:55:08 +00:00
reimar
c9f2fed145 Slightly deobfuscate 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25677 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-11 20:42:32 +00:00
reimar
c706a93140 Another small simplification. Slightly worse performance in the case 
where a buffer underrun happens, but this really should not matter.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25676 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-11 20:36:33 +00:00
reimar
023340d6bd Slightly simplify read_buffer code 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25675 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-11 20:32:42 +00:00
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