RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity
33,497 Commits 41 Branches 85 Tags 160 MiB
Commit Graph

855 Commits

Author SHA1 Message Date
diego 8ba6b4eaf9 cosmetics: Remove pointless empty lines at EOF. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30675 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-20 21:02:49 +00:00
diego d306b727b1 Remove pointless '#if 1' preprocessor directives. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30654 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-19 10:22:29 +00:00
diego 93c1e23c47 Mark some more functions that are not used outside of their files as static. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30632 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-18 09:26:00 +00:00
diego 11b55ec7a8 Fix exit_player() usage throughout the codebase. 
exit_player() was declared with differing parameter types in mplayer.c and
mplayer.h. Make the declaration in the .h file match the one in the .c file
and adjust all usages of exit_player() throughout the codebase. Also move
the exit_player() declaration into mp_core.h next to exit_player_with_rc().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30558 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-14 10:53:20 +00:00
diego 1b3d1fcd9d Remove unused variables, fixes the warnings: 
libao2/ao_mpegpes.c:336: warning: unused variable 's'
libao2/ao_mpegpes.c:335: warning: unused variable 'i'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30555 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-13 21:29:32 +00:00
komh bc802c1e3e Audio buffer is too large so that it takes too long time to respond to audio 
control such as software volume control.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30502 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-04 14:42:57 +00:00
komh f275d3d32c Add OS/2 KAI audio driver support 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30481 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-01 14:09:53 +00:00
reimar a91702125c Explain why we still disable the ALSA resampler even though it is probably 
actually working nowadays.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30452 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-28 18:26:12 +00:00
Uoti Urpala d84685ce13 Merge svn changes up to r30448 2010-01-28 00:54:08 +02:00
reimar 4c211d8851 Declare variable closer to where it is used. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30444 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-27 18:23:19 +00:00
reimar 882ce0cd5e Remove a useless global variable. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30443 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-27 18:21:27 +00:00
reimar 5f326498f7 Do not needlessly make local variable static. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30442 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-27 18:16:41 +00:00
reimar 051d3210c7 Remove useless initializers. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30441 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-27 18:11:15 +00:00
reimar 01a39f2fc3 Do not needlessly use (file-)global variables. 
Since they also were initialized to a value and non-constant (changed
by ALSA) this might actually have caused bugs.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30440 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-27 18:10:07 +00:00
Uoti Urpala e28e4a1b15 Merge svn changes up to r30419 2010-01-25 15:59:53 +02:00
Uoti Urpala 69fe2522f8 Merge svn changes up to r30301 2010-01-25 15:07:30 +02:00
reimar a92b3d446b Support more formats for -ao pcm in raw mode. 
Patch by Peter Fordham [peter.fordham gmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30400 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-23 11:21:56 +00:00
reimar e8dded6d4f MPlayer's format now correctly identifies AC3 as either little- or big-endian, 
remove unnecessary special workaround.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30284 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-11 20:29:33 +00:00
reimar 33bc71f10d Add support for distinguishing between little- and big-endian SPDIF AC3 
and converting between both.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30283 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-11 20:27:52 +00:00
reimar d3ae3611ce More uses of AF_FORMAT_IS_AC3 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30282 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-11 20:02:46 +00:00
reimar d4b1ff0d03 Use AF_FORMAT_IS_AC3 in ao_oss.c 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30281 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-11 19:55:07 +00:00
reimar e3c9e9a09b Use af_fmt2bits, it should give more sensible values than snd_pcm_format_physical_width, 
especially for AC3.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30279 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-11 19:40:58 +00:00
reimar 10321db5c0 Use af_fmt2bits instead of reimplementing it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30277 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-11 19:26:33 +00:00
reimar 6910cdaae1 Add and use AF_FORMAT_IS_AC3 macro. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30276 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-11 19:23:18 +00:00
Uoti Urpala b390b9b28f Merge svn changes up to r30185 2010-01-08 01:36:05 +02:00
Uoti Urpala 231b33a02f Merge svn changes up to r30165 2010-01-08 01:05:30 +02:00
reimar c23a01e260 Fixup SDL configure check: 
- Make it work without sdl-config which adds at least useless or even hurtful
  cflags and also does not work for cross-compiling
- If using sdl-config, make it use the CFLAGS we actually use for compiling
  instead of something else. Thus #undef main is needed in the test program.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30178 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-03 11:33:33 +00:00
reimar 92cd6dc3e9 Simplify range-checking functions for subopt parsing. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30165 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-01 13:23:16 +00:00
reimar f102ac7a8c Fix function declarations to avoid casting function pointers. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30164 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-01 13:18:49 +00:00
Uoti Urpala 67b40bd219 Merge svn changes up to r30065 2009-12-29 23:57:14 +02:00
Uoti Urpala c447ef4e74 ao_alsa: Reinitialize parameters properly when reopening 
ao_alsa used static variables to define the parameter values for
snd_pcm_hw_params_set_buffer_time_near() and
snd_pcm_hw_params_set_periods_near(). The variables were non-const and
the desired value was only set in the initializer. The ALSA functions
in question take a pointer argument to an in/out parameter which is
modified to reflect the value actually used. As a result, when playing
multiple files or otherwise reinitializing the AO the later instances
could use values that had been modified by earlier calls. Change the
code to always always use the same default values.
 2009-12-29 16:54:38 +02:00
Uoti Urpala 57ce95b96a audio: Remove fixed decode_audio() return size limit (MAX_OUTBURST) 
A couple of months ago MPlayer's ALSA driver started rounding the
amount of input data it was willing to accept in one call down to an
integer multiple of the value it set in ao_data.outburst. In some
configurations it was possible for this value to exceed the 64 KiB
limit on the amount MPlayer was willing to write in a single call to
the AO. As a result ao_alsa accepted 0 bytes in each play() call and
audio playback failed. Fix this by removing the fixed 64 KiB limit on
the amount of audio sent to AO at once; the limit was mostly a remnant
of older code anyway.
 2009-12-29 15:51:59 +02:00
reimar cb7a098c81 Add a missing const, fixes a compiler warning. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30062 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-18 20:27:35 +00:00
reimar b7fa147ee8 Allow pulseaudio to restore the previous volume on init instead of forcing to 
full volume.
The old behaviour can be restored by using -volume 100.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30061 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-18 20:26:28 +00:00
reimar e858d98f4f Get rid of global volume variable, it is only used for temporary values. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30060 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-18 20:22:39 +00:00
Uoti Urpala 1598302be6 Fix printf format strings with invalid '%lf' conversion 
Some code used an invalid '%lf' conversion specification for double
arguments. Maybe they were written that way due to confusion with
scanf where doubles are indicated by '%lf'; however it is not a valid
printf format specifier. Change those cases to use '%f'.
 2009-12-15 15:27:30 +02:00
Uoti Urpala 287b62163e Merge svn changes up to r29912 2009-11-16 07:01:46 +02:00
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
Uoti Urpala 7fd3eb0f74 Merge svn changes up to r29752 
As part of merging subtitle-in-terminal changes make
update_subtitles() only clear existing subtitles if called with the
reset argument, and not try to set new ones. Later calls should set
the needed new subtitles, and this change avoids some problems with
trying to set subtitles when mp_property_sub() in command.c gets
called from initialization code before full initialization.
 2009-10-06 04:48:00 +03: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
Uoti Urpala 0e1b7765be Merge svn changes up to r29644 2009-09-04 19:49:35 +03: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
Uoti Urpala 7431eabaab Merge svn changes up to r29544 2009-08-22 04:31:30 +03: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
Uoti Urpala 95da34aa07 Merge svn changes up to r29532 2009-08-18 02:29:37 +03: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
Uoti Urpala 4a36b51ea6 Merge svn changes up to r29455 2009-07-29 01:32:03 +03: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
Uoti Urpala a2037a2eff Merge svn changes up to r29412 2009-07-07 02:56:01 +03:00
Uoti Urpala 0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
Amar Takhar e306174952 Translation system changes part 2: replace macros by strings 
Replace all MSGTR_ macros in the source by the corresponding English
string.
 2009-07-07 01:38:20 +03:00
Amar Takhar b5972d6f14 Translation system changes part 1: wrap translated strings 
Replace mp_msg() calls which have a translated string as the format
argument with mp_tmsg and add _() around all other translated strings.
 2009-07-07 01:28:07 +03:00
Grigori Goronzy 91d0d3a082 Add OSS4 vmix volume control to ao_oss 
Support for per-application volume control, introduced by OSS4.
This adds a check in configure to add the proper include path
to the CFLAGS, if needed. The path is taken from /etc/oss.conf.
 2009-06-24 20:49:21 +02: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
Uoti Urpala 1db1773ec2 Merge svn changes up to r29277 2009-05-08 23:50:26 +03: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
Uoti Urpala cf9edda1d3 Merge svn changes up to r29117 2009-04-01 02:43:47 +03: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
Uoti Urpala ae2faad666 Merge svn changes up to r28951 2009-03-14 23:52:45 +02: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
Uoti Urpala e0172b96e3 Merge svn changes up to r28862 2009-03-07 01:04:41 +02: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
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