Nicolas George
79d8cfacf0
lavfi: loop on request_frame if necessary.
...
Some filters need several input frames before producing output.
For these filter, it becomes simpler to return 0 in
request_frame() and let the framework call it again until
output has been produced.
2013-04-03 17:33:27 +02:00
Michael Niedermayer
c208576cef
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Fix make checkheaders without opencl headers.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-03 15:35:23 +02:00
Carl Eugen Hoyos
c484b3af15
Fix make checkheaders without opencl headers.
2013-04-03 15:28:29 +02:00
Michael Niedermayer
d3fc2db47e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avfiltergraph: check for sws opts being non-NULL before using them.
Conflicts:
libavfilter/avfiltergraph.c
libavfilter/graphparser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-03 15:20:05 +02:00
Paul B Mahol
6fcb4ae1d8
lavfi/afade * biquads: call av_frame_copy_props()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-03 11:10:00 +00:00
Paul B Mahol
0ab10f69ef
lavfi/earwax: clip sample, this is what sox does
...
Fixes #1884 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-03 10:55:13 +00:00
Carl Eugen Hoyos
6e90d9e206
vf_deshake: Reorder constant arguments in an if() statement.
...
Fixes compilation with clang on netbsd with --disable-optimizations.
Tested-by: Paul B Mahol
2013-04-03 12:52:38 +02:00
Paul B Mahol
bf65752848
aphaser filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-03 08:33:59 +00:00
Anton Khirnov
6e3c13a559
avfiltergraph: check for sws opts being non-NULL before using them.
...
Avoid snprintfing a NULL pointer.
CC: libav-stable@libav.org
2013-04-03 09:29:55 +02:00
Clément Bœsch
e7692a9bac
lavfi/edgedetect: reindent after previous commit.
2013-04-03 00:31:19 +02:00
Clément Bœsch
e366aec030
lavfi/edgedetect: add direct path.
2013-04-03 00:30:48 +02:00
highgod0401
9079359141
deshake opencl based on comments on 20130402 3rd
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-02 15:57:44 +02:00
Clément Bœsch
6278bc8a6c
lavfi/curves: make use of options to store the preset names.
2013-04-01 20:37:45 +02:00
Nicolas George
52853077ee
lavfi/af_asetnsamples: fix EOF handling.
...
Only filter one buffered frame.
Correctly return EOF if there is none.
2013-04-01 10:38:52 +02:00
Nicolas George
f810ca63f8
lavfi: detect merge failure for unknown layouts.
...
Detect when filtering known layouts from an explicit list
results in an empty list.
Fix erratic behavior.
2013-04-01 10:37:48 +02:00
Stefano Sabatini
39aad43465
lavfi/overlay: fix debug PTS output in try_filter_frame()
...
The PTS of the input frames must be interpreted according to the input
timebase, which is not the same as the output timebase.
2013-03-31 18:00:44 +02:00
Clément Bœsch
01b2d1288a
lavfi/volume: use designated initializers for the sample_fmts declaration.
2013-03-31 11:58:20 +02:00
Clément Bœsch
4dae804d3c
lavfi/volume: use copy props helper instead of incomplete manual code.
2013-03-31 11:58:20 +02:00
Clément Bœsch
29667a2c20
decimate: check for avctx ptr before closing.
...
Fixes a crash init failed before setting avctx.
2013-03-31 10:00:32 +02:00
Michael Niedermayer
e0dd8cadcc
af_join: fix channel count and format
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 15:29:14 +01:00
Michael Niedermayer
acaee26008
af_channelsplit: set output channels, fix assertion failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 14:29:11 +01:00
Paul B Mahol
705b607db8
lavfi/biquads: fix min allowed option value
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-28 11:52:11 +00:00
Clément Bœsch
1ae44c87c9
lavfi/gradfun: remove rounding to match C and SSE code.
...
There is no noticable benefit for such precision.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-28 07:59:29 +01:00
Clément Bœsch
38a2f88d39
lavfi/gradfun: fix dithering in MMX code.
...
Current dithering only uses the first 4 instead of the whole 8 random values.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-28 07:59:18 +01:00
Clément Bœsch
2d66fc543b
lavfi/gradfun: fix rounding in MMX code.
...
Current code divides before increasing precision.
Also reduce upper bound for strength from 255 to 64. This will prevent
an overflow in the SSSE3 and MMX filter_line code: delta is expressed as
an u16 being shifted by 2 to the left. If it overflows, having a
strength not above 64 will make sure that m is set to 0 (making the
m*m*delta >> 14 expression void).
A value above 64 should not make any sense unless gradfun is used as
a blur filter.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-28 07:59:04 +01:00
Clément Bœsch
8b9a153ef3
lavfi/gradfun: do not increment DC pointer for odd values.
...
First DC is only used once otherwise. This also makes the code
consistent with ASM versions.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-28 07:58:55 +01:00
Michael Niedermayer
0d6e5a1712
vsrc_mandelbrot: Mandel morphing support
...
Example: ffplay -f lavfi "mandelbrot=outer=outz:morphamp=1:end_scale=2:maxiter=100"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-27 19:27:37 +01:00
Michael Niedermayer
79938a4e97
mandelbrot: add outer coloring method showing bailouted z
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-27 16:21:44 +01:00
Michael Niedermayer
a2b5825649
vsrc_mandelbrot: support coloring the outside white
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-27 16:00:18 +01:00
Paul B Mahol
62d36abef4
lavfi/mptestsrc: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-26 13:23:42 +00:00
Paul B Mahol
401f9c95e9
lavfi/cellauto: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-26 13:23:42 +00:00
Paul B Mahol
8c5b37b402
lavfi/life: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-26 13:23:42 +00:00
Paul B Mahol
975efc8864
lavfi/mandelbrot: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-26 13:23:42 +00:00
Paul B Mahol
54056c6655
lavfi/testsrc: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-26 13:23:41 +00:00
Paul B Mahol
7606f4a1af
lavfi/fps: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-26 13:23:41 +00:00
Clément Bœsch
e32cbd0f54
lavfi/perms: add myself to the copyright header.
2013-03-26 02:41:05 +01:00
Clément Bœsch
9371467d9d
lavfi/perms: add seed option.
2013-03-26 02:39:55 +01:00
Clément Bœsch
e600d0628e
lavfi/perms: remove unecessary indirection after f7324c06
.
2013-03-26 02:24:03 +01:00
Clément Bœsch
133035c40d
lavfi/curves: add forgotten strong_contrast preset.
2013-03-26 01:05:26 +01:00
Clément Bœsch
183f3450fd
lavfi/curves: support preset shorthand.
2013-03-26 00:04:06 +01:00
Clément Bœsch
dc65d784df
lavfi/curves: add presets support.
...
Except for the vintage preset, the values are defined by Lou Logan based
on the ones found in Adobe Photoshop CS6.
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
2013-03-25 23:48:51 +01:00
Björn S
f248b8a902
blend: Adding yuvj pixelformats to the blend effect
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-25 13:14:38 +01:00
Michael Niedermayer
ae65327e5e
vsrc_testsrc: avoid floats and non bit exactness
...
The round to zero behavior is maintained, possibly this should
be changed to round to nearest.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-25 03:11:43 +01:00
Nicolas George
125acd2152
lavfi: support multiple rounds of format negotiation.
...
Remove the temporary hack for amerge and replace it with a
generic solution.
2013-03-24 23:17:47 +01:00
Nicolas George
00da527b44
lavfi/af_amerge: return EAGAIN if the input layouts are not known.
...
Also downgrade the error to a warning.
2013-03-24 23:17:47 +01:00
Clément Bœsch
386dc9a3a8
lavfi/thumbnail: add support for named options.
2013-03-24 20:38:12 +01:00
Stefano Sabatini
3b811bcf67
lavfi/colormatrix: reword error message in init
...
Change:
"source and destination color space are identical"
which is a true fact, but doesn't tell nothing about what's wrong, to:
"Source and destination color space must not be identical"
which tells more explicitly what the problem is.
2013-03-24 20:21:35 +01:00
Stefano Sabatini
1b140835b6
lavfi/colormatrix: add support for named options
2013-03-24 20:21:20 +01:00
Clément Bœsch
cbf224b631
lavfi/tinterlace: use standard options parsing.
2013-03-24 12:26:25 +01:00
Clément Bœsch
9e21c89841
lavfi/subtitles: use standard options parsing.
2013-03-24 12:26:25 +01:00
Clément Bœsch
06784b737a
lavfi/smartblur: use standard options parsing.
2013-03-24 12:26:25 +01:00
Clément Bœsch
15878b2b5b
lavfi/setfield: use standard options parsing.
2013-03-24 12:26:25 +01:00
Clément Bœsch
e62587bc5e
lavfi/overlay: use standard options parsing.
2013-03-24 12:26:25 +01:00
Clément Bœsch
5dc074d321
lavfi/kerndeint: use standard options parsing.
2013-03-24 12:26:25 +01:00
Clément Bœsch
ab228f9163
lavfi/idet: use standard options parsing.
2013-03-24 12:26:25 +01:00
Clément Bœsch
552c02f20f
lavfi/histeq: use standard options parsing.
2013-03-24 12:26:25 +01:00
Clément Bœsch
b27a8ba13c
lavfi/gradfun: use standard options parsing.
2013-03-24 12:26:25 +01:00
Clément Bœsch
b595819cde
lavfi/geq: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
cb0fb4d04d
lavfi/fieldorder: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
a733481d0a
lavfi/field: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
7edda1a935
lavfi/deshake: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
1341dd2dd0
lavfi/cropdetect: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
a36d903601
lavfi/boxblur: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
3f8072886b
lavfi/blackframe: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
67ad9fd098
lavfi/settb: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
8b994c8c1c
lavfi/select: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
f7324c068f
lavfi/perms: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
07b7c2a217
lavfi/sine: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
3ac77f67af
lavfi/apad: use standard options parsing.
2013-03-24 12:26:24 +01:00
Michael Niedermayer
62f56fd7ea
buffersink/uninit: use av_frame_free() not unref
...
Fixes memleak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-23 23:49:33 +01:00
Stefano Sabatini
a42d15a3a0
lavfi/anullsrc: add missing checks
2013-03-23 16:53:25 +01:00
Stefano Sabatini
4e8062c2d7
lavfi/anullsrc: remove extra parentheses
2013-03-23 16:53:19 +01:00
Stefano Sabatini
fe2cfd50f0
lavfi/anullsrc: simplify logging code in config_props
2013-03-23 16:53:13 +01:00
Stefano Sabatini
5373a2a221
lavfi/anullsrc: fix format negotiation
...
Samplerate and channel layouts must be set in query_formats.
2013-03-23 16:53:08 +01:00
Michael Niedermayer
9bb6504e3b
Merge commit '20a8ee3061e6d777600c13db731bee3c25878991'
...
* commit '20a8ee3061e6d777600c13db731bee3c25878991':
af_asyncts: fix compensation and PTS monotonicity
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-23 12:16:32 +01:00
Clément Bœsch
89b4e758d3
lavfi/blend: always peek the first frame of each queue.
...
Before the change, filter_frame() always waited for 2 samples in the
bottom frames queue. This notably fixes commands such as
./ffplay tests/lena.pnm -vf split,blend=c0_mode=addition
2013-03-22 23:09:08 +01:00
Jindřich Makovička
20a8ee3061
af_asyncts: fix compensation and PTS monotonicity
...
This patch improves af_asyncts behavior on streams with bogus PTS, which
are either non-monotonic, or contain PTS jitter, and trigger the
non-monotonicity error. With this patch, af_asyncts is able to correct
these streams and avoid the error.
Firstly, it fixes resample compensation calculation by supplying proper
units to avresample_set_compensation (sample count per second instead
of sample count per some arbitrary frame size). Also, the calculation of
the compensation itself is fixed - delta is proportional to an adjustment
of the compensation, not the compensation itself. Ideally, the compensation
should converge to a value that keeps delta at zero.
To be able to deal with sources with PTS jitter even without resampling,
small PTS errors are adjusted, so the output frames do not overlap.
Finally, one more monotonicity check is added.
The FATE reference changes because now there is 8 less samples of
silence because of the pts jitter.
Signed-off-by: Jindřich Makovička <makovick@gmail.com>
2013-03-22 20:09:34 +01:00
Paul B Mahol
c5b484e616
lavfi/vf_stereo3d: use standard options parsing
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-21 09:17:32 +00:00
Michael Niedermayer
76fdced109
asrc_sine: avoid use of INFINITY as it might be a non constant
...
This should fix compilation on openbsd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-21 00:53:57 +01:00
Nicolas George
2753d4ebf0
lavfi/vf_yadif: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
8d4d11cd89
lavfi/vf_unsharp: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
769cc30072
lavfi/vf_transpose: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
392ec7ec1c
lavfi/vf_pad: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
b201c167d0
lavfi/vf_fps: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
4e2bcec95f
lavfi/vf_fade: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
80580b405a
lavi/vf_drawbox: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
37438d0a72
lavfi/vf_delogo: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
40ecd44f00
lavfi/vf_decimate: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
6202cf5dd8
lavfi/vf_crop: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
e9ca55aedd
lavfi/af_volume: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
e9f45a833d
lavfi/vf_tile: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
8c6c811b21
lavfi/avf_concat: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
befbcc374d
lavfi: add common code to handle options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
21b092de7c
lavfi: add sine audio source.
2013-03-20 21:04:28 +01:00
Nicolas George
68fb7e260b
lavfi/concat: fix silence duration computation.
...
Inside send_silence(), delta_ts was used inconsistently:
sometimes as the new value, sometimes as the old value.
Consistently use it as the new value, and add an argument
to know the last segment duration.
2013-03-20 20:59:45 +01:00
Nicolas George
5eb273b2e7
lavfi/buffersink: check av_frame_ref() failure.
2013-03-20 13:35:24 +01:00
Paul B Mahol
ac44e52f50
lavfi/showwaves: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-20 12:29:54 +00:00
Michael Niedermayer
df804041bd
Merge commit '6599b087de62a5f9f2a8d61a1952d777d1bff804'
...
* commit '6599b087de62a5f9f2a8d61a1952d777d1bff804':
buffersrc: fix a typo.
lavc, lavfi: fix counting number of planes in AVBufferRef wrappers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20 11:30:56 +01:00
Paul B Mahol
17c1881d58
lavfi: remove harddup libmpcodecs wrapper
...
It is supposed to be used with mencoder only and does
nothing when used with ffmpeg.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-19 17:15:53 +00:00
Anton Khirnov
6599b087de
buffersrc: fix a typo.
...
Vertical shift is log2_chroma_h, not log2_chroma_w.
2013-03-19 11:12:17 +01:00
Anton Khirnov
c977039e58
lavc, lavfi: fix counting number of planes in AVBufferRef wrappers
...
Number of planes is not always equal to the number of components even
for formats marked with PIX_FMT_PLANAR -- e.g. NV12 has three components
in two planes.
2013-03-19 11:12:17 +01:00
Clément Bœsch
c10b57973d
lavfi/pad: fix horizontal/vertical shift confusion.
2013-03-18 08:51:55 +01:00
Clément Bœsch
76d1c07c89
lavfi/ebur128: add metadata injection.
2013-03-18 03:21:08 +01:00
Michael Niedermayer
8152451b56
buffersrc: fix w/h error
...
Found-by: nevcairiel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 02:00:57 +01:00
Michael Niedermayer
975fbd43ad
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavfi/buffersink: fix header.
lavfi/buffersrc: disable deprecated warnings.
lavfi/buffersrc: check channel count changes.
lavfi/buffersrc: set channel layout if it is known.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 14:30:33 +01:00
Stefano Sabatini
5787a71637
lavfi/swapuv: remove deprecated base field use
2013-03-17 13:06:01 +01:00
Michael Niedermayer
171bd38eda
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavc,lavfi: fix calculating the plane size in the AVBufferRef wrappers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 12:59:04 +01:00
Nicolas George
7e6c67dd24
lavfi/buffersink: fix header.
...
Move non-obsolete functions, structures and constants outside
the scope of "#if FF_API_AVFILTERBUFFER".
Add attribute_deprecated to av_buffersink_get_buffer_ref()
and av_buffersink_poll_frame().
Add doxygen for av_buffersink_get_frame_flags().
2013-03-17 12:31:25 +01:00
Nicolas George
a5149607df
lavfi/buffersrc: disable deprecated warnings.
2013-03-17 12:31:24 +01:00
Nicolas George
f29c28a884
lavfi/buffersrc: check channel count changes.
2013-03-17 12:31:24 +01:00
Nicolas George
3cd342636f
lavfi/buffersrc: set channel layout if it is known.
...
Introduced in 01649c7
, lost in the API change.
2013-03-17 11:59:51 +01:00
Anton Khirnov
6552808014
lavc,lavfi: fix calculating the plane size in the AVBufferRef wrappers
...
It is supposed to be height * linesize, not width * linesize.
Thanks to Hendrik Leppkes for pointing out the bug.
2013-03-17 09:10:04 +01:00
Clément Bœsch
286153ea48
lavfi/alphaextract: fix frame memleak.
2013-03-17 03:12:44 +01:00
Clément Bœsch
2b27f7fb04
lavfi/thumbnail: replace frame unref with free.
...
Fixes memleak spotted by FATE.
2013-03-17 01:46:22 +01:00
Stefano Sabatini
db36ea5b5e
lavfi/settb: add support for named options
2013-03-17 00:27:33 +01:00
Stefano Sabatini
0407a79e41
lavfi/blackframe: add support for named options
2013-03-17 00:27:08 +01:00
Hendrik Leppkes
d8dccf69ff
lavfi: let gcc realign the stack on public graph driving functions
...
The functions which actually drive the filter graph by pushing
frames through it need to ensure an aligned stack for SIMD functions.
This fixes a crash in YADIF filter when using a mingw build in a MSVC application.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 23:52:35 +01:00
Clément Bœsch
8d84e90c9b
lavfi/delogo: 10l forgotten trailing NULL in shorthand.
...
Regression since de3e0ab3
.
2013-03-16 23:37:58 +01:00
James Darnley
c9a51c29fc
yadif: remove an 'm' from the LOAD macro definition
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 22:33:49 +01:00
James Darnley
1d3b14cac2
yadif: remove repeated check on width
...
The filter already checks that width (and height) are greater than 3.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 22:33:30 +01:00
James Darnley
7976d92dac
yadif: cosmetic indentation from previous commits
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 22:33:06 +01:00
James Darnley
0a5814c9ba
yadif: x86 assembly for 9 to 14-bit samples
...
These smaller samples do not need to be unpacked to double words
allowing the code to process more pixels every iteration (still 2 in MMX
but 6 in SSE2). It also avoids emulating the missing double word
instructions on older instruction sets.
Like with the previous code for 16-bit samples this has been tested on
an Athlon64 and a Core2Quad.
Athlon64:
1809275 decicycles in C, 32718 runs, 50 skips
911675 decicycles in mmx, 32727 runs, 41 skips, 2.0x faster
495284 decicycles in sse2, 32747 runs, 21 skips, 3.7x faster
Core2Quad:
921363 decicycles in C, 32756 runs, 12 skips
486537 decicycles in mmx, 32764 runs, 4 skips, 1.9x faster
293296 decicycles in sse2, 32759 runs, 9 skips, 3.1x faster
284910 decicycles in ssse3, 32759 runs, 9 skips, 3.2x faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 22:32:54 +01:00
James Darnley
17e7b49501
yadif: x86 assembly for 16-bit samples
...
This is a fairly dumb copy of the assembly for 8-bit samples but it
works and produces identical output to the C version. The options have
been tested on an Athlon64 and a Core2Quad.
Athlon64:
1810385 decicycles in C, 32726 runs, 42 skips
1080744 decicycles in mmx, 32744 runs, 24 skips, 1.7x faster
818315 decicycles in sse2, 32735 runs, 33 skips, 2.2x faster
Core2Quad:
924025 decicycles in C, 32750 runs, 18 skips
623995 decicycles in mmx, 32767 runs, 1 skips, 1.5x faster
406223 decicycles in sse2, 32764 runs, 4 skips, 2.3x faster
387842 decicycles in ssse3, 32767 runs, 1 skips, 2.4x faster
307726 decicycles in sse4, 32763 runs, 5 skips, 3.0x faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 22:32:34 +01:00
Hendrik Leppkes
a77f453703
lavfi/avcodec: deprecate remainders of the avcodec glue code
...
Since lavfi works natively with AVFrame now, these functions are no longer
necessary and can be removed in a future bump.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 17:04:36 +01:00
Michael Niedermayer
946cbf04ee
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
af_join: do not leak input frames.
asrc_anullsrc: return EOF, not -1
Conflicts:
libavfilter/asrc_anullsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 16:58:41 +01:00
Michael Niedermayer
7fff5781b6
Merge commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b'
...
* commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b':
vf_showinfo: remove its useless init function
AVOptions: fix using named constants with child contexts.
Conflicts:
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 16:38:11 +01:00
Michael Niedermayer
b64077bebe
Merge commit '9676b9a2cdc4a90611188fc48d8d388e427997c5'
...
* commit '9676b9a2cdc4a90611188fc48d8d388e427997c5':
AVOption: remove an unused function parameter.
filters.texi: restore mistakenly removed section name for noformat
avfiltergraph: use sizeof(var) instead of sizeof(type)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 16:28:27 +01:00
Michael Niedermayer
ecade984ac
Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'
...
* commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf':
avfiltergraph: replace AVFilterGraph.filter_count with nb_filters
Conflicts:
doc/APIchanges
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/graphparser.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 16:09:37 +01:00
Clément Bœsch
3b2b636a2a
lavfi: add perms and aperms filters.
2013-03-16 16:04:59 +01:00
Anton Khirnov
4750b05d67
af_join: do not leak input frames.
2013-03-16 05:37:01 +01:00
Anton Khirnov
c2b9bd97f5
asrc_anullsrc: return EOF, not -1
2013-03-16 05:36:46 +01:00
Anton Khirnov
f4281f4571
asrc_anullsrc: do not set samplerate and channel layout explicitly
...
They are auto-negotiated.
2013-03-16 05:36:35 +01:00
Anton Khirnov
e4a7b2177d
vf_showinfo: remove its useless init function
...
Filter private data is memset to 0 so there is no point in explicitly
initing anything to 0.
2013-03-16 05:36:14 +01:00
Anton Khirnov
dd74e3ef33
avfiltergraph: use sizeof(var) instead of sizeof(type)
2013-03-16 05:34:20 +01:00
Anton Khirnov
42c7c61ab2
avfiltergraph: replace AVFilterGraph.filter_count with nb_filters
...
This is more consistent with the naming in the rest of Libav.
2013-03-16 05:33:23 +01:00
Anton Khirnov
556aab8f11
lavfi: use designated initializers in avfilter_class
2013-03-16 05:33:06 +01:00
James Darnley
3d751b1ef6
yadif: correct strides in filter_edges_16bit
...
The C code treats the data as arrays of uint16_t so strides must not
be in bytes but in pixels.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-15 19:10:55 +01:00
Michael Niedermayer
cd5f50a255
avfilter: avoid direct access to AVFrame.channels
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-15 16:13:53 +01:00
Michael Niedermayer
0bcea7b575
vf_pp: use new API to access qp table
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-15 03:02:27 +01:00
Clément Bœsch
1edbeb3532
lavfi/ebur128: check histogram allocations.
2013-03-15 02:58:29 +01:00
Clément Bœsch
db670e5366
lavfi/ebur128: add framelog option.
2013-03-15 02:35:26 +01:00
Nicolas George
7a71544f9d
lavfi/graphdump: fix output for unknown layouts.
2013-03-14 20:52:50 +01:00
Clément Bœsch
9ace0dbe41
lavfi/ebur128: use same ref for inputs and outputs.
...
Fixes Ticket2342.
2013-03-14 18:43:53 +01:00
Clément Bœsch
fe898a037d
Revert "lavfi/ebur128: fix format negociation for output."
...
This reverts commit 9efcfbed9d
.
All the shame on me; this commit is actually causing more problems
(broken outputs but also crashes) than it was solving.
2013-03-14 06:25:20 +01:00
Clément Bœsch
9efcfbed9d
lavfi/ebur128: fix format negociation for output.
...
Before this change, the audio input and output formats are set
independently, so the lavfi negociation could pick different settings
for the input and output. This is particularly true for the channel
layout settings, where multiple choices were available.
Fixes Ticket2342.
2013-03-14 01:24:42 +01:00
Clément Bœsch
a95a38793c
lavfi/thumbnail: support flushing.
...
This makes possible the raise of one picture if the input has less than
the number of frames to analyze.
Fixes Ticket1992.
2013-03-14 00:14:19 +01:00
Hendrik Leppkes
ed69c69a01
lavfi/avcodec: fix API version checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 22:18:02 +01:00
Hendrik Leppkes
3c7f669972
lavfi/avcodec: cleanup includes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 22:14:58 +01:00
James Darnley
0735b50880
yadif: restore speed of the C filtering code
...
Always use the special filter for the first and last 3 columns (only).
Changes made in 64ed397
slowed the filter to just under 3/4 of what it
was. This commit restores the speed while maintaining identical output.
For reference, on my Athlon64:
1733222 decicycles in old
2358563 decicycles in new
1727558 decicycles in this
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 22:07:25 +01:00
Stefano Sabatini
ae732640ab
lavfi/cropdetect: add support for named options
2013-03-13 20:38:54 +01:00
Clément Bœsch
de3e0ab35f
lavfi/delogo: remove sscanf and rely on av_opt_set_from_string() only.
2013-03-13 19:00:10 +01:00
Clément Bœsch
e7279638e8
lavfi/thumbnail: remove unecessary poll_frame() callback.
2013-03-13 19:00:10 +01:00
Clément Bœsch
bce2e97a16
lavfi/mptestsrc: raise filter_frame() error.
2013-03-13 19:00:10 +01:00
Clément Bœsch
afa0b90803
lavfi/mandelbrot: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
227a4b63f5
lavfi/life: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
fe6077d902
lavfi/cellauto: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
f32fee570a
lavfi/alphamerge: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
05854f5505
lavfi/movie: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
bdbdadbaff
lavfi/buffersrc: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
27ce858c98
lavfi/showspectrum: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
df5be5e275
lavfi/avfilter: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
60bd8c11b6
lavfi/concat: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
00a13a9cdb
lavfi/anullsrc: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
44f3d21799
lavfi/aevalsrc: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
1b0d0e6b72
lavfi/atempo: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
dda59d9adc
lavfi/asetnsamples: raise filter_frame() error.
2013-03-13 19:00:08 +01:00
Clément Bœsch
c82bb2815b
lavfi/aresample: raise filter_frame() error.
2013-03-13 19:00:08 +01:00
Michael Niedermayer
c31f07574d
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
hqdn3d: Fix out of array read in LOWPASS
cabac: remove unused argument of ff_init_cabac_states()
rawdec: fix a typo -- || instead of |
Conflicts:
libavcodec/cabac.c
libavcodec/h264.c
libavfilter/vf_hqdn3d.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 14:49:00 +01:00
Michael Niedermayer
8bcebf9e4a
Merge commit '555000c7d5c1e13043a948ebc48d2939b0ba6536'
...
* commit '555000c7d5c1e13043a948ebc48d2939b0ba6536':
h264: check that DPB is allocated before accessing it in flush_dpb()
vf_hqdn3d: fix uninitialized variable use
vf_gradfun: fix uninitialized variable use
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 13:34:06 +01:00
Loren Merritt
5b3c1aecb2
hqdn3d: Fix out of array read in LOWPASS
...
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-13 09:14:59 +01:00
Stefano Sabatini
aeac1dae29
lavfi/fieldorder: add support to named options
2013-03-13 00:37:13 +01:00
Stefano Sabatini
a3233e9d7a
lavfi/fieldorder: remove unused headers and commented define
2013-03-13 00:34:51 +01:00
Nicolas George
c14a8c834c
lavfi/buffersink: schedule removing the "ff" variants.
...
They are no longer needed since there is no incompatible
ABI version.
2013-03-12 23:31:07 +01:00
Nicolas George
9a2688826d
lavfi/buffersink: rename filter structures.
...
Reduce the diff with the fork.
2013-03-12 23:31:07 +01:00
Michael Niedermayer
212b89f8b4
avfilter: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 21:23:54 +01:00
Michael Niedermayer
0cfbfaaa12
Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'
...
* commit '7b89cd20d844cbe763ca34e63e99d110043cf241':
eamad: allocate a dummy reference frame when the real one is missing
Replace remaining includes of audioconvert.h with channel_layout.h
Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 15:44:15 +01:00
Michael Niedermayer
a75f01d7e0
Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'
...
* commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111':
Add the bumps and APIchanges entries for reference counted buffers changes.
Conflicts:
Changelog
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 15:35:39 +01:00
Hendrik Leppkes
c69acbf881
lavfi/moviesrc: use refcounted frames
2013-03-12 03:23:57 +01:00
Nicolas George
73b40e2eb6
lavfi/buffersink: move the filter structures at the end.
...
Also apply a few cosmetic fixes (spaces, trailing comma) to
help match them with the fork's implementation.
2013-03-11 19:00:49 +01:00
Anton Khirnov
d0a863ac89
vf_hqdn3d: fix uninitialized variable use
...
CC:libav-stable@libav.org
2013-03-11 18:28:35 +01:00
Anton Khirnov
887d31d455
vf_gradfun: fix uninitialized variable use
...
CC:libav-stable@libav.org
2013-03-11 18:28:34 +01:00
Nicolas George
de54a96aa8
lavfi/buffersink: implement av_buffersink_get_samples().
...
Note: the implementation could be more efficient, but at
the cost of more diff.
Most of the code from the following commit:
commit a2cd9be212
Author: Anton Khirnov <anton@khirnov.net>
Date: Fri May 4 19:22:38 2012 +0200
lavfi: add an audio buffer sink.
Adapted to call av_buffersink_get_frame_flags() instead of
accessing the frame directly.
2013-03-10 19:39:25 +01:00
Nicolas George
b71db3f38e
lavfi/buffersrc: do not dereference NULL frame.
...
frame = NULL is used to indicate EOF.
2013-03-10 17:05:55 +01:00
Nicolas George
03b87fe5e3
lavfi: rename sink_buffer.c into buffersink.c.
2013-03-10 17:05:55 +01:00
Nicolas George
3add5dc88e
lavfi: remove buffersink.c.
...
It only contains merge conflicts leftovers.
The real code is in sink_buffer.c.
2013-03-10 17:05:55 +01:00
Nicolas George
fa41f7ecd6
lavfi/sink_buffer: move stuff to reduce the diff.
...
Note: av_buffersink_get_samples() is not yet implemented,
abuffersink is not yet a drop-in replacement of the fork's
abuffersink.
2013-03-10 17:05:46 +01:00
Stefano Sabatini
35135a3989
lavfi/smartblur: add support to named options
2013-03-10 16:38:45 +01:00
Nicolas George
b0012de420
lavfi/buffersrc: implement flags.
...
The PUSH flags is necessary for efficient scheduling;
otherwise there is no feedback when adding frames to
closed paths.
The NO_CHECK_FORMAT is a small optimization that does
not cost much to implement.
The KEEP_REF flag maps to the add/write distinction in
the fork's API.
2013-03-10 13:56:17 +01:00
Stefano Sabatini
606efe18be
lavfi/unsharp: add missing option flags
2013-03-10 13:22:58 +01:00
Michael Niedermayer
f963c77856
avfilter: avoid direct access to "frame"->channels
...
This avoids ABI issues
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-10 11:25:54 +01:00
Xi Wang
5d639b2b4a
vf_pad: fix a & instead of && typo
...
Avoid buffer overflow in buffer_needs_copy()
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-03-10 11:16:10 +01:00
Xi Wang
969e8d35b5
lavfi/pad: avoid buffer overflow in buffer_needs_copy()
...
Replace & with short-circuit &&.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-03-10 10:38:42 +01:00
Clément Bœsch
65fc80f012
lavfi: add curves filter.
2013-03-10 03:00:10 +01:00
Clément Bœsch
3d813e7ec3
lavfi: bump minor version after the first round of evil changes.
2013-03-10 02:59:43 +01:00
Michael Niedermayer
108434a30c
sink_buffer: remove unused variables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-10 02:52:15 +01:00
Clément Bœsch
96e4b00d62
lavfi: remove remaining forgotten min/rej perms.
2013-03-10 02:38:21 +01:00
Clément Bœsch
f0a5f71074
lavfi/hue: reindent.
2013-03-10 02:13:02 +01:00
Clément Bœsch
3da54858d3
lavfi/hue: add an optimized direct path.
2013-03-10 02:13:02 +01:00
Michael Niedermayer
a05a44e205
Merge commit '7e350379f87e7f74420b4813170fe808e2313911'
...
* commit '7e350379f87e7f74420b4813170fe808e2313911':
lavfi: switch to AVFrame.
Conflicts:
doc/filters.texi
libavfilter/af_ashowinfo.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersink.c
libavfilter/buffersrc.c
libavfilter/buffersrc.h
libavfilter/f_select.c
libavfilter/f_setpts.c
libavfilter/fifo.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/version.h
libavfilter/vf_aspect.c
libavfilter/vf_bbox.c
libavfilter/vf_blackframe.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_fps.c
libavfilter/vf_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_showinfo.c
libavfilter/vf_transpose.c
libavfilter/vf_vflip.c
libavfilter/vf_yadif.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavfilter/yadif.h
Following are notes about the merge authorship and various technical details.
Michael Niedermayer:
* Main merge operation, notably avfilter.c and video.c
* Switch to AVFrame:
- afade
- anullsrc
- apad
- aresample
- blackframe
- deshake
- idet
- il
- mandelbrot
- mptestsrc
- noise
- setfield
- smartblur
- tinterlace
* various merge changes and fixes in:
- ashowinfo
- blackdetect
- field
- fps
- select
- testsrc
- yadif
Nicolas George:
* Switch to AVFrame:
- make rawdec work with refcounted frames. Adapted from commit
759001c534
by Anton Khirnov.
Also, fix the use of || instead of | in a flags check.
- make buffer sink and src, audio and video work all together
Clément Bœsch:
* Switch to AVFrame:
- aevalsrc
- alphaextract
- blend
- cellauto
- colormatrix
- concat
- earwax
- ebur128
- edgedetect
- geq
- histeq
- histogram
- hue
- kerndeint
- life
- movie
- mp (with the help of Michael)
- overlay
- pad
- pan
- pp
- pp
- removelogo
- sendcmd
- showspectrum
- showwaves
- silencedetect
- stereo3d
- subtitles
- super2xsai
- swapuv
- thumbnail
- tile
Hendrik Leppkes:
* Switch to AVFrame:
- aconvert
- amerge
- asetnsamples
- atempo
- biquads
Matthieu Bouron:
* Switch to AVFrame
- alphamerge
- decimate
- volumedetect
Stefano Sabatini:
* Switch to AVFrame:
- astreamsync
- flite
- framestep
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-10 01:40:35 +01:00
Clément Bœsch
ee0a8bcba1
lavfi/showspectrum: fix outpicref initialization.
...
In 81f2549
, output pixel format was changed from rgb24 to planar yuv,
but the initialization was left unchanged. As a result, the chroma
planes were left uninitalized. This was not noticed since the current
ff_get_video_buffer() seems to be initializing the buffer. This won't be
the case anymore after the Evil Plan.
2013-03-09 23:52:33 +01:00
Michael Niedermayer
6c17ff84ad
Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830'
...
* commit 'efa7f4202088c70caba11d7834641bc6eaf41830':
Use the avstring.h locale-independent character type functions
avstring: Add locale independent versions of some ctype.h functions
Conflicts:
avprobe.c
doc/APIchanges
libavcodec/dvdsubdec.c
libavcodec/utils.c
libavutil/avstring.c
libavutil/avstring.h
libavutil/eval.c
libavutil/parseutils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 14:57:41 +01:00
Anton Khirnov
0651e892e1
Replace remaining includes of audioconvert.h with channel_layout.h
2013-03-08 07:42:13 +01:00
Anton Khirnov
d8b31be6ca
Add the bumps and APIchanges entries for reference counted buffers changes.
2013-03-08 07:41:49 +01:00
Anton Khirnov
7e350379f8
lavfi: switch to AVFrame.
...
Deprecate AVFilterBuffer/AVFilterBufferRef and everything related to it
and use AVFrame instead.
2013-03-08 07:37:18 +01:00
Reimar Döffinger
efa7f42020
Use the avstring.h locale-independent character type functions
...
Make sure the behavior does not change with the locale.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-07 15:16:36 +02:00
Michael Niedermayer
4c56b79a16
vf_stereo3d: Add AVOption table terminator
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-05 22:29:57 +01:00
Clément Bœsch
34d0ea5247
lavfi/deshake: support named options.
2013-03-05 21:16:54 +01:00
Stefano Sabatini
8d9509377e
lavfi/overlay: improve log message warning in case of clipped overlay
2013-03-05 20:09:50 +01:00
Stefano Sabatini
f164228fd7
lavfi/overlay: add support for partial overlaying
...
Partially rework the iteration logic, in order to limit iteration only
for the clipped overlay region.
2013-03-05 20:09:21 +01:00
Paul B Mahol
1c808943b8
lavfi/mp: drop mp=stereo3d filter
...
The filter has been natively integrated into libavfilter.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-05 18:45:35 +00:00
Paul B Mahol
3f35f36a2e
lavfi: port MP stereo3d filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-05 18:36:40 +00:00
Clément Bœsch
14e240cb4a
lavfi/opencv: isgraph -> av_isgraph.
...
Fix build after 88d55b8
.
2013-03-03 22:06:48 +01:00
Reimar Döffinger
88d55b827d
Remove incorrect use of ctype.h functions.
...
As far as I can tell the code should not change behaviour
depending on locale in any of these places.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-03-03 21:44:10 +01:00
Nicolas George
3d2adeb6f8
lavfi/af_aresample: fix info log for unknown layouts.
2013-02-28 19:23:12 +01:00
Nicolas George
2bd104c72a
lavfi/af_aresample: fix layout consistency check.
...
If the channel layout is unknown, lswr will internally use
the default one for the corresponding number of channels.
2013-02-28 19:23:12 +01:00
Michael Niedermayer
21c2e201f6
vf_lut: correct color/comp permutation
...
Fixes Ticket2225
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-27 17:09:21 +01:00
Paul B Mahol
e0ccb5fa38
lavfi/hflip: support more formats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-25 13:07:29 +00:00
Paul B Mahol
eac93932b0
lavfi/geq: improve support for formats with alpha plane
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-25 12:54:40 +00:00
Michael Niedermayer
bb7bc3443d
af_biquads: memset(0) cache
...
Fixes valgrind warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-25 04:39:26 +01:00
Stefano Sabatini
566560b85c
lavfi/abuffersink: fix weird indent and spacing
2013-02-24 23:22:23 +01:00
Stefano Sabatini
b59cd089ff
lavfi/abuffersink: add sample_rates field to AVABufferSinkParams
...
Allow to select sample rates.
2013-02-24 23:21:28 +01:00
Michael Niedermayer
c4c702b6d3
avfilter/avfiltergraph.h: Move public field out of the private fields
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24 20:31:56 +01:00
Michael Niedermayer
71cf094e1b
Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf'
...
* commit '9f1223562e134bac6345a465870b9d56ff7d60cf':
lavfi: connect libavresample options to af_resample via AVFilterGraph
Conflicts:
doc/APIchanges
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24 17:10:55 +01:00
Nicolas George
e568d432b1
lavfi/formats: reindent after last commit.
2013-02-24 12:05:06 +01:00
Nicolas George
2d98dd3d14
lavfi: fix merging of formats and clarify exception.
...
The following commit:
b97d61f
avfilter/ff_merge_formats: only merge if doing so does not loose chroma or alpha
introduced an exception to avoid lossy conversions.
Add a comment to explain the logic.
Fix the call to avoid applying it on audio formats.
2013-02-24 11:58:52 +01:00
Nicolas George
bf0712c2f8
libavfilter/af_amerge: fix segfault if init fails.
2013-02-24 11:23:51 +01:00
Justin Ruggles
9f1223562e
lavfi: connect libavresample options to af_resample via AVFilterGraph
2013-02-23 17:07:54 -05:00
Michael Niedermayer
73fce258b7
vf_mp: Set pseudo pal
...
Fixes ticket2140
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-23 19:32:24 +01:00
Michael Niedermayer
cfcab4c507
vf_overlay: silence warning: X may be used uninitialized in this function
...
Also ensure that format is valid in query_formats
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-23 12:10:35 +01:00
Michael Niedermayer
3c14c82b7e
avfilter: Silence warning: passing argument 3 of av_image_copy from incompatible pointer type
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-23 12:08:05 +01:00
Stefano Sabatini
f30979e095
lavfi/boxblur: add support to named options
2013-02-22 19:57:20 +01:00
Paul B Mahol
47619e41c4
blend filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-21 20:16:23 +00:00
Nicolas George
01649c79c8
lavfi/buffersrc: set channel layout if it is known.
...
If buffersrc was configured for frames with an unknown layout,
the incoming frames will have channel_layout = 0.
If the format negotiation has selected a known (and compatible)
channel layout for the link, the frame is assumed to have
that layout, the field must be set before injecting the frame
in the filters.
2013-02-21 12:36:35 +01:00
Michael Niedermayer
cdb7a1ac63
vf_idet: adapt default scores due to bugfix
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-21 01:58:07 +01:00
Michael Niedermayer
dc9edb06b0
vf_idet: Fix macro arguments sideeffect
...
Fixes valgrind errors
should improve detection scores
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-21 01:58:07 +01:00
Clément Bœsch
9b9d996b34
lavfi/subtitles: fix recently introduced warning about discarded const qualifier.
2013-02-20 19:47:32 +01:00
Stefano Sabatini
22b06103f0
lavfi/overlay: add format option
...
In particular, fix misbehavior in case main and overlay input formats
mismatch (e.g. YUV420 and YUV444).
2013-02-20 19:39:40 +01:00
Stefano Sabatini
2db0056f96
lavfi/overlay: apply minor consistency fixes
2013-02-20 19:18:17 +01:00
Stefano Sabatini
3d77a27548
lavfi/overlay: implement shortest option
...
Force termination when the overlay stream ends. Simplify scripting logic,
for example when an infinite source is used to generate a background for
a composite video.
2013-02-20 19:17:11 +01:00
Stefano Sabatini
a2a1e20fa2
lavfi/decimate: use named options
2013-02-20 19:07:48 +01:00
Michael Niedermayer
951d39fecd
avfilter: fix segfault with setsar/dar
...
Reported-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-20 12:34:05 +01:00
Stefano Sabatini
dd37326345
lavfi/hue: reindent after previous commit
2013-02-20 11:29:12 +01:00
Stefano Sabatini
d709a18ac2
lavfi/hue: simplify parsing by making use of option shorthands
2013-02-20 11:28:59 +01:00
Michael Niedermayer
b97d61f924
avfilter/ff_merge_formats: only merge if doing so does not loose chroma or alpha
...
Fixes Ticket1280
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-19 15:00:01 +01:00
Paul B Mahol
f2d200d460
lavfi/overlay: yuv444p & yuva444p support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-19 11:11:42 +00:00
Paul B Mahol
480ddf2bc9
lavfi/histogram: overlay display mode for levels histogram mode
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-18 20:13:07 +00:00
Clément Bœsch
f894246304
lavf/showspectrum: add divVerent in the (c) for his recent work on the filter.
2013-02-18 13:34:37 +01:00
Paul B Mahol
f4e29c408c
lavfi/noise: switch to AVLFG noise generator
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-17 21:45:21 +00:00
Clément Bœsch
f3147917bf
lavf/subtitles: error out in case of bitmap subtitles.
2013-02-17 13:35:35 +01:00
Clément Bœsch
90fb3e9bee
lavfi/subtitles: set a different description between ass and subtitles.
2013-02-17 12:58:20 +01:00
Clément Bœsch
2a14b23484
lavfi: rename vf_ass.c to vf_subtitles.c
2013-02-17 12:58:20 +01:00
Clément Bœsch
08d149d688
lavfi/subtitles: support charenc option.
2013-02-17 12:58:20 +01:00
Clément Bœsch
3a0a959dcb
lavfi/subtitles: split options between ass and subtitles.
2013-02-17 12:58:20 +01:00
Stefano Sabatini
7ca2f8b113
lavfi/mp: drop mp=kerndeint filter
...
The filter has been natively integrated into libavfilter.
2013-02-17 11:48:45 +01:00
Stefano Sabatini
8c85a9f046
lavfi/mp: drop mp=unsharp filter
...
The native filter is equivalent from the point of view of the features
and of performances.
2013-02-17 11:48:37 +01:00
Stefano Sabatini
89505f2c3f
lavfi/unsharp: add missing NULL check
2013-02-17 11:48:31 +01:00
Stefano Sabatini
64e592eef2
lavfi/unsharp: merge definition and declaration in init_filter_param()
2013-02-17 11:48:24 +01:00
Stefano Sabatini
d2cadea3f0
lavfi/unsharp: directly access in-loop variables in apply_unsharp()
...
Increase performance, to match mp=unsharp.
2013-02-17 11:48:12 +01:00
Stefano Sabatini
ef4c71e8f8
lavfi/unsharp: add check on matrix x/y size values oddity
2013-02-17 11:47:39 +01:00
Michael Niedermayer
b4bb996d6f
yadif: remove unused variable
...
Found by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-16 13:24:43 +01:00
Paul B Mahol
af882e1819
lavfi: port MP noise filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-16 11:42:41 +00:00
Michael Niedermayer
446f7c62a2
Merge commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82'
...
* commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82':
vf_yadif: fix out-of line reads
Conflicts:
libavfilter/vf_yadif.c
tests/ref/fate/filter-yadif-mode0
tests/ref/fate/filter-yadif-mode1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-16 09:09:38 +01:00
Michael Niedermayer
fab8a89abe
Merge commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13'
...
* commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13':
vf_yadif: factorize initializing the filtering callbacks
Conflicts:
libavfilter/vf_yadif.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-16 08:48:45 +01:00
James Darnley
87d359ff8f
lavfi/yadif: support 9, 12, and 14 bits per pixel
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-16 00:32:02 +01:00
James Darnley
724061888b
lavfi/yadif: remove unnecessary cast
...
Finish what 99162f8
started
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-16 00:32:02 +01:00
Stefano Sabatini
f84ef19f3f
lavfi/kerndeint: move is_rgb_packed definition to the internal context
...
No need to recompute it for each new frame.
2013-02-16 00:08:31 +01:00
Clément Bœsch
51ba843f19
lavfi/kerndeint: use aligned linesizes for the temporary buffer.
...
This improves the performances just enough to match mp=kerndeint.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-02-16 00:08:31 +01:00
Stefano Sabatini
2042cd3769
lavfi/unsharp: extend range for amount values, to reflect the behavior of mp=unsharp
...
Also update the documentation accordingly, and suggest a meaningful range.
2013-02-16 00:08:31 +01:00
Stefano Sabatini
fbcc584d3a
lavfi/unsharp: use named options, and add missing checks on matrix size values
...
In particular, avoid out-of-buffer access and crashes with too big
values, and rework documentation accordingly.
2013-02-16 00:08:31 +01:00
Hendrik Leppkes
5ad43af9a6
lavfi/kerndeint: use av_pix_fmt_desc_get instead of directly accessing the table
...
Fixes FATE in MSVC DLL builds.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-15 19:07:37 +01:00
sedacca@comcast.net
b64de24fd7
lavfi/ebur128: advance pointer to samples
...
Correct the advancement of a pointer to skip over LFE samples as
intended in the loudness computation.
This suggested patch is 3 of 3 for Ticket #2144 "libavfilter ebur128
loudness inaccuracy, irregular time interval, LFE interference".
This suggested patch supersedes the contribution of January 15, 2013
in the thread “[PATCH] lavfi: EBU R.128 irreg time, ch weights, skip
LFE” which combined multiple fixes in one batch.
2013-02-15 16:39:25 +01:00
David A. Sedacca
de21e6736e
lavfi/ebur128: fix channel weights
...
Correct the recognition of channel layouts for good channel weight
in the loudness computation.
This suggested patch is 2 of 3 for Ticket #2144 "libavfilter ebur128
loudness inaccuracy, irregular time interval, LFE interference".
Signed-off-by: David A. Sedacca <sedacca at comcast.net>
2013-02-15 16:38:58 +01:00
Anton Khirnov
64ed397635
vf_yadif: fix out-of line reads
...
Some changes in the border pixels, visually indistinguishable.
2013-02-15 16:08:33 +01:00
Anton Khirnov
ccd70d9c16
vf_yadif: factorize initializing the filtering callbacks
...
Do it all in config_props().
2013-02-15 16:08:00 +01:00
Stefano Sabatini
7ac3ccc5f2
lavfi/unsharp: use the same macros used in the original MP filter
...
Remove possibly pointless inconsistency with the ported code.
Also specify parameter value ranges consistent with those of the ported
filter.
2013-02-15 01:06:56 +01:00
Clément Bœsch
0224375180
lavfi/showspectrum: simplify intensity_color_table declaration.
2013-02-14 23:10:01 +01:00
Clément Bœsch
cf8dec7d64
lavfi/showspectrum: pretty-align constants.
...
Binary object unchanged.
2013-02-14 23:04:20 +01:00
Nicolas George
c557a5b08e
lavfi/vf_ass: reindent after last commit.
2013-02-14 16:36:03 +01:00
Nicolas George
bb3303b94c
lavfi/vf_ass: ignore subtitles decoding errors.
...
A broken packet with invalid data in the middle of the stream
should not prevent from decoding the rest of the file.
Work around trac ticket #2264 .
2013-02-14 16:33:53 +01:00
Paul B Mahol
41ae43cade
lavfi: remove softskip libmpcodecs wrapper
...
It is supposed to be used with mencoder only and does
nothing when used with ffmpeg.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-14 12:51:56 +00:00
Paul B Mahol
968f8acec8
lavfi: remove dsize libmpcodecs wrapper
...
Filter does nothing, and supposed funcionality
is already available with native filter(s).
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-14 12:51:56 +00:00
Paul B Mahol
34126cd090
lavfi/transpose: support more pix fmts
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-13 16:29:47 +00:00
Paul B Mahol
8160864b00
lavfi/amerge: make description consistent with documentation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-11 14:43:23 +00:00
Stefano Sabatini
3acaea26e5
lavfi/il: filter out hwaccels formats from the list of supported formats
2013-02-10 21:00:56 +01:00
Stefano Sabatini
0b18965434
lavfi/il: move query_formats() definition up
...
Respect order of call during the filter lifecycle, improve readability.
2013-02-10 14:00:19 +01:00
Stefano Sabatini
63a9962287
lavfi/il: simplify/generalize linesize computation
...
Rely on generic utilities for computing each plane linesize.
In particular, add support to NV12/21 formats and avoid use of
PIX_FMT_PLANAR pixdesc flag, whose semantics is questionable.
It also fixes various crashes.
2013-02-10 14:00:19 +01:00
Paul B Mahol
969039eb6e
lavfi/il: fix typo in Copyright
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-09 21:56:04 +00:00
Paul B Mahol
c0a8918f2a
lavfi: remove mp=il filter
...
Native il video filter is now available.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-09 21:43:39 +00:00
Paul B Mahol
6e9abce5e2
lavfi: port MP il filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-09 21:41:53 +00:00
Paul B Mahol
4fa9defc7f
lavfi/histogram: make waveform mode more useful
...
Now it displays all color components (not just luma)
either in parade or overlay and also works with RGB colorspace.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-09 16:05:28 +00:00
Paul B Mahol
e5670cb8a1
lavfi/histogram: make it C90 compliant
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-09 12:27:49 +00:00
Paul B Mahol
29a92c0114
histogram filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-09 11:45:56 +00:00
Stefano Sabatini
c0a4871c16
lavfi/select: correctly set prev_t and prev_pts
...
In particular, fix trac ticket #2248 .
2013-02-07 21:28:46 +01:00
Stefano Sabatini
872855e2a5
lavfi/select: avoid double -> int lossy conversion in debug log
2013-02-07 21:00:54 +01:00
Michael Niedermayer
a00c4b4db0
af_biquad: avoid subtraction in loop
...
17% faster
Note the speedup is smaller if its done before
storing in the context (gcc 4.6.3 core i7)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 19:46:02 +01:00
Michael Niedermayer
9f956611e3
af_biquad: unroll loop, remove variable copies
...
This makes the code about 7% faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 19:03:22 +01:00
Nicolas George
b5884db437
lavfi: fix missing space in error message.
2013-02-07 12:22:09 +01:00
Nicolas George
3dea8b375e
lavfi: remove disabled code.
2013-02-07 12:22:09 +01:00
Michael Niedermayer
6e9f3f3b65
Merge commit '238614de679a71970c20d7c3fee08a322967ec40'
...
* commit '238614de679a71970c20d7c3fee08a322967ec40':
cdgraphics: do not rely on get_buffer() initializing the frame.
svq1: replace struct svq1_frame_size with an array.
vf_yadif: silence a warning.
Conflicts:
libavcodec/svq1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 14:53:49 +01:00
Anton Khirnov
99162f8d46
vf_yadif: silence a warning.
...
clang says:
libavfilter/vf_yadif.c:192:28: warning: incompatible pointer types assigning to
'void (*)(uint8_t *, uint8_t *, uint8_t *, uint8_t *, int, int, int, int, int)'
from 'void (uint16_t *, uint16_t *, uint16_t *, uint16_t *, int, int, int, int, int)'
2013-02-06 10:21:51 +01:00
Michael Niedermayer
2b20397e1f
libmpcodecs/vd_ffmpeg.h: remove, its unused and removed upstream
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 15:54:39 +01:00
multiple authors
81e357db62
libmpcodecs/vf_pullup: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 15:41:19 +01:00
multiple authors
13afcdd00e
libmpcodecs/vf_uspp: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 15:41:00 +01:00
multiple authors
3ce3d4cc3c
libmpcodecs/vf_unsharp: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 15:40:43 +01:00
multiple authors
7a4885600f
libmpcodecs/vf_spp: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 14:53:53 +01:00
multiple authors
14132599a3
libmpcodecs/vf_sab: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 14:47:33 +01:00
multiple authors
fe8bc6ddfc
libmpcodecs/pullup: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 14:47:13 +01:00
multiple authors
8f7e3e678b
libmpcodecs/vf_noise: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 14:18:15 +01:00
multiple authors
3ca46d0c10
libmpcodecs/vf_pp7:update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 14:17:28 +01:00
multiple authors
fdd574ed3f
libmpcodecs/vf_qp: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 14:17:17 +01:00
multiple authors
b7e6622971
libmpcodecs/vf_mcdeint: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 14:00:20 +01:00
multiple authors
25ed6e99d7
libmpcodecs/vf_ilpack: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 13:59:47 +01:00
multiple authors
011702f5a9
libmpcodecs/vf_ivtc: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 13:59:34 +01:00
multiple authors
0b36a05c17
libmpcodecs/vf_fspp: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 13:44:53 +01:00
multiple authors
2b9eb6167b
libmpcodecs/av_helpers: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 13:43:35 +01:00
multiple authors
e02c713fb1
libmpcodecs/vf_filmdint: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 13:40:08 +01:00
multiple authors
5d0115118d
libmpcodecs/vf_divtc: update to latest version in mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 13:39:46 +01:00
multiple authors
99a0813a7e
libhmpcodec/mp_msg: update to latest from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 13:02:28 +01:00
multiple authors
745cb39d05
libmpcodecs/help_mp: update to latest from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 12:58:20 +01:00
multiple authors
a54737f7ea
libmpcodecs/cpudetect: update to latest from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 12:55:10 +01:00
Michael Niedermayer
0b6f34cc9f
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avfilter: x86: consistent filenames for filter optimizations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 11:56:48 +01:00
multiple authors
103a2c2b17
libmpcodecs: update img_format.* & mp_image.* to latest from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 03:30:17 +01:00
multiple authors
708ed15d8c
libmpcodecs/vf_stereo3d: update to latest version from mplayer
...
Merged commits:
commit 9a2978f37bcdf7a28235c9322e9e5a4fe15e2ff2
Author: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu Jan 31 12:12:36 2013 +0000
Add more vf_stereo3d output formats.
Adds high quality green-magenta and yellow-blue dubois
anaglyph 3D output support.
Patch by thomas schorpp, thomas.schorpp gmail
git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35906 b3059339-0415-0410-9bf9-f77b7e298cf2
commit 2c50e66460d8d3ec460cbf9425f252f75ea1022d
Author: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun Aug 12 17:31:47 2012 +0000
Add another anaglyph color variant.
Patch by Bob [mpbob ezpi net].
git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35080 b3059339-0415-0410-9bf9-f77b7e298cf2
commit 71c5261c2ac63e6e29a5a899b52d1ec4bdb62c4e
Author: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun Aug 12 17:25:30 2012 +0000
Convert comments into designated initializers.
That is a simple way to ensure they always correspond
to what the compiler actually does.
git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35079 b3059339-0415-0410-9bf9-f77b7e298cf2
commit d7164c5e1ba524c2a6983d979ef57e193b2c8a9f
Author: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun Aug 12 17:20:24 2012 +0000
Make compiler give the ana_coeff array automatically the right size.
Makes adding more colour schemes easier.
git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35078 b3059339-0415-0410-9bf9-f77b7e298cf2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 03:05:54 +01:00
Diego Biurrun
e66240f22e
avfilter: x86: consistent filenames for filter optimizations
2013-02-04 15:00:47 +01:00
Rudolf Polzer
81f2549ec9
lavfi/showspectrum: display multiple channels in separate row
...
The showspectrum filter gets multiple channel (any count) support.
Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
2013-02-04 13:37:43 +00:00
Rudolf Polzer
773fc6e0c7
lavfi/showspectrum: set default height to 512
...
Only power-of-two FFTs are supported; so to get a full spectrum
(that is, one up to Nyquist), the height must be a power of two.
Therefore, change the default height from 480 to 512.
Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
2013-02-03 17:05:31 +00:00
Stefano Sabatini
1897109c00
lavfi/pad: add support to named options
2013-02-03 17:01:56 +01:00
Stefano Sabatini
fd6b6efbd2
lavfi/crop: fix help message for the keep_aspect option
2013-02-02 15:32:34 +01:00
Michael Niedermayer
6726fb6533
avfilter/vf_hqdn3d.h: restore author attribution, history and project name
...
See git blame of pre split avfilter/vf_hqdn3d.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-02 13:18:10 +01:00
Michael Niedermayer
d593f2b241
avfilter/x86/vf_hqdn3d_init: fix author attribution & project name
...
Reference: 7a1944b907
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-02 13:18:09 +01:00
Michael Niedermayer
0d13a7b786
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vf_hqdn3d: x86: Add proper arch optimization initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-02 13:18:01 +01:00
Diego Biurrun
76d90125cd
vf_hqdn3d: x86: Add proper arch optimization initialization
2013-02-01 13:11:45 +01:00
Nicolas George
d2ccab5f8a
lavfi/buffersrc: forward filter_frame errors.
...
Note: The ret variable was unused.
2013-01-31 21:03:54 +01:00
Nicolas George
dcce43340f
lavfi/af_amerge: set outbuf->audio->channels.
...
The value is lost because of avfilter_copy_buffer_ref_props().
Fix trac ticket #2217 .
2013-01-31 21:03:54 +01:00
Nicolas George
ae14887ee7
lavfi/af_amerge: check for buffer queue overflows.
...
Without that test, ff_bufqueue_add silently discards the
oldest buffer, that leaves in[i].nb_samples inconsistent,
and causes later a segfault.
2013-01-31 21:03:54 +01:00
Nicolas George
6560625f0a
lavfi/bufferqueue: add ff_bufqueue_is_full().
2013-01-31 21:03:54 +01:00
Stefano Sabatini
e47114d545
lavfi: increment max number of registered filters from 128 to 256
...
The total number of implemented filters is already over 128.
2013-01-31 16:47:37 +01:00
Paul B Mahol
402ea625ab
lavfi/biquads: remove pointless casts
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-31 13:16:32 +00:00
Paul B Mahol
b70ea49ca3
Port biquads filters from SoX
...
Adds allpass, bass, bandpass, bandreject, biquad,
equalizer, highpass, lowpass and treble filter.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-31 12:13:55 +00:00
Michael Niedermayer
5068bcda95
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vf_delogo: fix copying the input frame.
Conflicts:
libavfilter/vf_delogo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-29 14:58:49 +01:00
Anton Khirnov
7194330bcd
vf_delogo: fix copying the input frame.
...
CC:libav-stable@libav.org
2013-01-29 07:33:02 +01:00
Anton Khirnov
f81c37e40f
vf_delogo: fix an uninitialized read.
...
CC:libav-stable@libav.org
2013-01-29 07:32:54 +01:00
Michael Niedermayer
1336382c6d
avfilter_get_audio_buffer_ref_from_frame: fix handling of >8 channels
...
Found-by: inferno@chromium.org
Reported-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-28 21:45:16 +01:00
Nicolas George
42c6f2a645
lavfi/vf_drawtext: default to expansion=normal.
2013-01-26 12:52:19 +01:00
Nicolas George
255ae9f380
lavfi: version bump and change log entries after the last commits.
2013-01-26 11:25:21 +01:00
Nicolas George
699b286a21
lavfi/af_anull: accept unknown channel layouts.
2013-01-26 11:15:38 +01:00
Nicolas George
b00502457a
lavfi/af_aresample: accept unknown channel layouts.
2013-01-26 11:15:38 +01:00
Nicolas George
6d962aec8d
lavfi/af_aformat: accept unknown channel layouts.
2013-01-26 11:15:38 +01:00
Nicolas George
ea645e90a1
lavfi/buffersrc: accept unknown channel layouts.
2013-01-26 11:15:38 +01:00
Nicolas George
19506af788
lavfi/sink_buffer: accept unknown channel layouts.
...
Add a field to the AVBufferSinkParams for a list of accepted
channel counts.
Change the default value for the lists in AVBufferSinkParams
to NULL, to let lavfi fill them with something useful.
The fail_enomem path is unneeded because filters are uninited
on failure.
2013-01-26 11:15:38 +01:00