Commit Graph

73 Commits

Author SHA1 Message Date
Uoti Urpala 12843385fe cleanup: ao_pcm: remove useless assignment to ao->buffersize 2011-06-26 05:50:06 +03:00
Uoti Urpala 40f6ab5064 ao_pcm, core: use new API in ao_pcm, change timing with it
Change ao_pcm to use the new audio output driver API and clean up some
of the code. Rewrite the logic controlling how playback timing works
when using -ao pcm. Deprecate the "fast" suboption; its only effect
now is to print a warning, but it's still accepted so that specifying
it is not an error.

Before, timing with -ao pcm and video enabled had two possible
modes. In the default mode playback speed was rather arbitrary - not
realtime, but not particularly fast. -ao pcm:fast tried to play back
at maximum video playback speed - mostly succeeding, but not quite
guaranteed to work in all cases. Now the default is to play at
realtime speed. The -benchmark option can now be used to get faster
playback (same as the video-only case). In the audio-only case
playback is always maximum speed.
2011-05-05 21:34:17 +03:00
Uoti Urpala 102b240e96 ao_pcm: change message to mention "-novideo" instead of "-vc null"
-novideo is the right way to disable video, and should also work in
more cases now that lavf is used as the default demuxer for more formats
(like AVI; internal AVI demuxer fails with -novideo).

Also change the man page description of -novideo a bit to make it
sound less negative about the chances of the option working.
2010-12-08 07:36:32 +02:00
cboesch fe3c4810e1 cleanup: remove NULL checks before free() all over the code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-14 13:11:20 +02:00
reimar 5deeba5f6a ao_pcm: Remove some disabled and pointless code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31686 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
Uoti Urpala e74361c488 Merge svn changes up to r31189 2010-05-30 15:51:33 +03:00
reimar 0dd2ddd2bc Change WAV header updating in ao_pcm to allow to up to almost 4GB size.
Patch by Rob McMullen [robm users sourceforge net]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31189 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-21 17:19:01 +00:00
Uoti Urpala 00323c06e2 Delete things related to old translation system
Remove the help/ subdirectory, configure code to create toplevel
help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
2010-03-10 03:47:14 +02:00
Uoti Urpala acdce0176a Merge svn changes up to r30732 2010-03-10 01:25:15 +02:00
tack 2f19fe91ec Output WAVE_FORMAT_EXTENSIBLE extension in wave header when waveheader
option is enabled (default) and channels > 2.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30708 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-22 14:24:53 +00:00
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
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 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
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 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
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
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
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
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 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
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 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
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 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
reimar 18004d2d98 Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21523 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 11:58:07 +00:00
diego cac6c0eea2 Remove bswap.h, use libavutil/bswap.h instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 15:02:45 +00:00
reimar 329ba64c0a le2me_32 is no longer a macro on PPC, and in general does not have to
be, thus using it like a constant is incorrect.
Move wavhdr initialization to the code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21266 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 13:19:32 +00:00
diego 5115aa181d Only set the default output filename when it was not passed on the command
line.  Noticed by Corey Hickey.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18501 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-14 10:21:56 +00:00
diego 3de60f8ff7 Move setting the output filename after the suboption parsing, otherwise it
cannot take the suboptions that were set into account.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18489 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-13 19:04:39 +00:00
reimar 86b0871127 -ao pcm:fast suboption for faster-than-realtime dumping
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18093 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-14 13:18:35 +00:00
rathann e7db4ccf1a Patch by Stefan Huehner / stefan % huehner ! org \
patch replaces '()' for the correct '(void)' in function
declarations/prototypes which have no parameters. The '()' syntax tell
thats there is a variable list of arguments, so that the compiler cannot
check this. The extra CFLAG '-Wstrict-declarations' shows those cases.

Comments about a similar patch applied to ffmpeg:

That in C++ these mean the same, but in ANSI C the semantics are
different; function() is an (obsolete) K&R C style forward declaration,
it basically means that the function can have any number and any types
of parameters, effectively completely preventing the compiler from doing
any sort of type checking. -- Erik Slagter

Defining functions with unspecified arguments is allowed but bad.
With arguments unspecified the compiler can't report an error/warning
if the function is called with incorrect arguments. -- Måns Rullgård


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 14:08:03 +00:00
reimar 252d940dd8 Set block_align in header, seems MatLab can not handle files without.
Patch by Pedro Larroy Tovar (pedro at larroy dot com).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16244 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-17 11:27:11 +00:00
reimar 64489b4d0c use MSTRZ suboption type
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14540 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-19 17:18:25 +00:00
reimar 60f4241a6d Default to audiodump.pcm with nowaveheader again, but document it in the manpage this time.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14328 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-03 14:16:07 +00:00
reimar 47d716f101 Do not use strndup, it is missing on MinGW.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14302 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-02 16:39:03 +00:00
faust3 61780877b5 missing ;
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14301 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-02 16:01:36 +00:00
reimar eca47b1a5e Add -ao pcm suboptions and remove -aofile and -waveheader options.
Base on idea by Olivier Rolland (billl at users dot sf dot net)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14299 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-02 14:41:47 +00:00
alex 14a29762f2 af_fmt2str_short
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14265 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-28 19:11:14 +00:00