summaryrefslogtreecommitdiffstats
path: root/libaf
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r28103Uoti Urpala2008-12-061-3/+3
|\
| * Add const to avoid warnings about discarded qualifiers.reimar2008-12-051-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28091 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28087Uoti Urpala2008-12-043-30/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Get rid of pointless 'extern' keywords.diego2008-12-033-30/+29
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to 27824Uoti Urpala2008-10-253-7/+11
|\| | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h libmpcodecs/dec_video.c libmpcodecs/vd.c libvo/x11_common.h mplayer.c stream/cache2.c
| * Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.diego2008-10-131-6/+5
| | | | | | | | | | | | | | 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
| * Fix channel order for ffmpeg flac codec.ulion2008-10-092-1/+6
| | | | | | | | | | | | | | This patch comes from Andrew de Quincey <adq_dvb at lidskialf dot net>. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27732 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27441Uoti Urpala2008-08-081-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Rename a bunch of miscellaneous preprocessor directives.diego2008-08-071-1/+1
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27374Uoti Urpala2008-07-301-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Start unifying names of internal preprocessor directives.diego2008-07-301-4/+4
| | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r27332Uoti Urpala2008-07-213-23/+23
|\|
| * Make af_hrtf tables static constreimar2008-07-151-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27291 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add const to libaf/filter.c functions.reimar2008-07-152-17/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27290 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27025Uoti Urpala2008-06-072-5/+5
|\| | | | | | | | | | | | | | | | | Conflicts: command.c libvo/vosub_vidix.c libvo/vosub_vidix.h mplayer.c
| * rename AF_CHANNEL_LAYOUT_LAVC_VORBIS* => AF_CHANNEL_LAYOUT_VORBIS*.ulion2008-06-072-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27019 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26979Uoti Urpala2008-06-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * cosmetics: Remove useless parentheses from return statements.diego2008-05-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26791 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26783Uoti Urpala2008-05-157-41/+40
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile common.mak configure libmpcodecs/vd_ffmpeg.c libmpdemux/demux_mkv.c libvo/vo_xv.c mplayer.c
| * Use standard license headers with standard formatting.diego2008-05-147-41/+40
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26772 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove _s/_st suffix from some struct namesUoti Urpala2008-04-251-1/+1
|/ | | | | Since the names are always used after the keyword "struct" having a suffix as in "struct demuxer_st" is almost completely pointless.
* Fix illegal identifier: Rename _ftype_t macro to FLOAT_TYPE.diego2008-04-105-73/+92
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26382 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove useless #include.diego2008-04-091-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26377 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge libaf/Makefile into Makefile, one less instance of recursive make.diego2008-04-091-37/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26376 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some useless quotes from #error preprocessor directives.diego2008-04-092-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26375 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use quotes instead of angular brackets for local includes.diego2008-04-094-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26374 b3059339-0415-0410-9bf9-f77b7e298cf2
* Handle af_ladspa conditional compilation in the usual way.diego2008-04-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26373 b3059339-0415-0410-9bf9-f77b7e298cf2
* #include config.h before all other headers.diego2008-03-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26235 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing header #include to fix 'make checkheaders'.diego2008-03-101-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26214 b3059339-0415-0410-9bf9-f77b7e298cf2
* af_export.c is only compiled if HAVE_SYS_MMAN_H is set, so using thatdiego2008-03-101-2/+0
| | | | | | | #ifdef within the file is pointless git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26213 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix ffvorbis decoder's output channel order with channel reordering function.ulion2008-03-052-1/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26164 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add directory names to libavcodec #includes.diego2008-03-031-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26152 b3059339-0415-0410-9bf9-f77b7e298cf2
* Wrap '#include <sys/mman.h>' in HAVE_SYS_MMAN_H.diego2008-03-011-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26137 b3059339-0415-0410-9bf9-f77b7e298cf2
* FFmpeg now uses different (unified) #include paths.diego2008-02-251-8/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace silly check for config.h inclusion, just include it.diego2008-02-241-3/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26096 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add MPLAYER_ prefix to multiple inclusion guards.diego2008-02-2210-32/+33
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
* This header should not have multiple inclusion guards, it is meantdiego2008-02-181-4/+3
| | | | | | | | to be included multiple times. patch by Alexander Stege mplayer a legale-software d com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26026 b3059339-0415-0410-9bf9-f77b7e298cf2
* typo fix: inited --> initializeddiego2008-02-141-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix buffer overflow bug by calculate the buffer size accurately.ulion2008-01-111-3/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25670 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add multiple inclusion guards to all header files that lack them.diego2008-01-013-0/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25581 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace multiple inclusion guards with leading underscores by default names.diego2008-01-014-12/+12
| | | | | | | Leading underscores are reserved for system identifiers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25579 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add explanatory comments to the #endif part of multiple inclusion guards.diego2007-12-313-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25563 b3059339-0415-0410-9bf9-f77b7e298cf2
* Relicense GPL v2 files as GPL v2+ and add proper license headers.diego2007-12-312-4/+38
| | | | | | | Done with permission from Michael Niedermayer, the author. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25557 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add new audio filter for encoding multi-channel audio into ac3 at runtime.ulion2007-12-133-0/+306
| | | | | | | | And if set first parameter of this filter to 1, it will do ac3 passthrough like hwac3 did. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25385 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix all current known multi-channel wrong order problems by addingulion2007-12-103-0/+1323
| | | | | | | | | | | 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
* Fix my wrong code in r25530.ulion2007-12-101-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25334 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix missing command line bug by making the input parameter constant.ulion2007-12-101-6/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25330 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l, bzero is deprecated, use memset insteadreimar2007-11-301-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25216 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove redundant changelog from comments. There's always svn log.ivo2007-11-291-33/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25199 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix multiple inclusion guards, identifiers starting with __ are reserveddiego2007-11-292-6/+6
| | | | | | | for the system. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25198 b3059339-0415-0410-9bf9-f77b7e298cf2
* Prevent from using data->len when data is NULL (when play() return NULL).ulion2007-11-231-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25143 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add padding and unroll loop 4x for at least another 10% speedupreimar2007-11-181-4/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25104 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change to a 64 bit accumulation variable instead of shifting.reimar2007-11-181-5/+5
| | | | | | | | Changing the way the loop is done is necessary to reduce register pressure. About 20% speedup even on 32 bit x86. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25103 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l, *ppc++ was supposed to be replaced by ppc[i] in r25100, but that is ↵reimar2007-11-181-2/+0
| | | | | | | | | | not any faster. Just removing the += s->samples_overlap - s->num_channels; still provides a ca. 20% speedup on x86 (AThlon X2 64) with gcc 3.4 (compiler stupidity?) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25102 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use "long" instead of "int" for innermost loop variable.reimar2007-11-181-1/+2
| | | | | | | About 12% faster on x86_64 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25101 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rearrange scaletempo inner loop.reimar2007-11-181-2/+5
| | | | | | | Speedup on x86 with gcc 3.4 36%, on x86_64 with gcc 4.1 5% git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25100 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l, someone mixed up && and ||, so if allocation of only one buffers failedreimar2007-11-181-1/+1
| | | | | | | that would not be detected. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25098 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid some casts by changing int8_t* to void* in af_scaletemporeimar2007-11-181-25/+27
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25097 b3059339-0415-0410-9bf9-f77b7e298cf2
* A/V sync: take audio filter buffers into accountuau2007-11-016-6/+13
| | | | | | | | | | | | | | | | | | Substract the delay caused by filter buffering when calculating currently playing audio position. This matters for af_scaletempo which buffers significant and varying amounts of data. For other current filters the effect is normally insignificant. Instead of the old time-based filter delay field (which was ignored) this version stores the per-filter delay in units of bytes input read without corresponding output. This allows the current scaletempo behavior where other filters before and after it can see the same nominal samplerate even though the real duration of the data varies; in this case the other filters can not know the delay they're causing in terms of real time. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24928 b3059339-0415-0410-9bf9-f77b7e298cf2
* af_scaletempo: code cleanupuau2007-11-011-10/+17
| | | | | | | | | Make internal functions static and remove leading '_' from some function names. Cast pointers to compatible 8-bit pointer types instead of ints when calculating their difference. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24927 b3059339-0415-0410-9bf9-f77b7e298cf2
* af_scaletempo: Fix crash in option parsinguau2007-11-011-1/+1
| | | | | | | | | | The value of the "speed" suboption was not initialized before calling subopt_parse(). If the command line had suboptions but "speed" was not one of them then the code accessed an uninitialized pointer and possibly crashed. Fixed by initializing the option value. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24926 b3059339-0415-0410-9bf9-f77b7e298cf2
* af_scaletempo: Fix audio copy positionuau2007-11-011-2/+2
| | | | | | | | | Because of a missing *num_channels factor the filter copied audio from an incorrect position. This mixed up the channel order and hurt audio quality even if the channels had identical content. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24925 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add audio filter scaletempouau2007-11-014-0/+553
| | | | | | | Patch by Robert Juliano, juliano.1 osu edu git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24924 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change decode_audio() interfaceuau2007-11-012-36/+7
| | | | | | | | | | |