Michael Niedermayer
835cc0f2e7
Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'
...
* commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da':
lavfi: change the filter registering system to match the other libraries
Conflicts:
cmdutils.c
ffplay.c
libavfilter/avfilter.c
libavfilter/avfilter.h
This removes the ability to put AVFilters in read only memory and having
them shareable.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:08:40 +02:00
Michael Niedermayer
710b0aa801
Merge commit '48a5adab62bd2a553f5069d41fa632a0701835e5'
...
* commit '48a5adab62bd2a553f5069d41fa632a0701835e5':
lavfi: add avfilter_init_str() to replace avfilter_init_filter().
avfilter_graph_create_filter() opaque is still passed to avfilter_init_filter()
which continues to pass it to init_opaque as its still used in the buffer sinks
the sinks should be changed and the opaque passing removed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 01:31:55 +02:00
Michael Niedermayer
86070b8e5a
Merge commit 'bc1a985ba030e9861d24965d42792850b43a43ea'
...
* commit 'bc1a985ba030e9861d24965d42792850b43a43ea':
lavfi: replace avfilter_open() with avfilter_graph_alloc_filter().
Conflicts:
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 00:31:44 +02:00
Stefano Sabatini
ed2c827575
lavfi/overlay: add repeatlast option
2013-04-12 00:09:19 +02:00
Michael Niedermayer
231fd4411f
Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'
...
* commit '38f0c0781a6e099f11c0acec07f9b8be742190c4':
lavfi: merge avfiltergraph.h into avfilter.h
Conflicts:
doc/APIchanges
ffmpeg_filter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.h
libavfilter/version.h
tools/graph2dot.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 23:50:39 +02:00
Clément Bœsch
9ab221f8d8
lavfi: deprecate aconvert.
...
This filter is not required anymore with aformat. Drop it at next bump.
2013-04-11 22:13:45 +02:00
Stefano Sabatini
e4fd58f472
lavfi/hue: apply major simplifications, and switch to AVOption-based system
...
This also drops support for "flat syntax" and "reinit" command.
"reinit" command is not very robust and complicates the logic more than
necessary, since requires to reset all the options in the command.
*This is a syntax break*.
2013-04-11 21:37:19 +02:00
Anton Khirnov
fa2a34cd40
lavfi: change the filter registering system to match the other libraries
...
Removes an arbitrary hardcoded limit on the number of filters.
2013-04-11 20:44:03 +02:00
Anton Khirnov
48a5adab62
lavfi: add avfilter_init_str() to replace avfilter_init_filter().
...
Drop the unused opaque parameter from its signature.
2013-04-11 20:39:13 +02:00
Anton Khirnov
bc1a985ba0
lavfi: replace avfilter_open() with avfilter_graph_alloc_filter().
...
Since we do not support "standalone" filters not attached to an
AVFilterGraph, we should not have a public function to create such
filters. In addition that function is horribly named, the action it does
cannot be possibly described as "opening" a filter.
2013-04-11 20:34:14 +02:00
Anton Khirnov
38f0c0781a
lavfi: merge avfiltergraph.h into avfilter.h
...
We do not support using filters without AVFilterGraph in practice
anyway, so there is no point in pretending we do.
2013-04-11 20:33:33 +02:00
Paul B Mahol
32a7b858c9
lavfi: remove telecine libmpcodecs wrapper
...
Native, with more features, filter is available.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 11:22:11 +00:00
Paul B Mahol
661e284b4a
telecine filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 11:12:39 +00:00
Michael Niedermayer
cb20ca14a3
Merge commit '2e81acc687e64d15dd93c74793060bb5a233f44d'
...
* commit '2e81acc687e64d15dd93c74793060bb5a233f44d':
x86inc: Fix number of operands for cmp* instructions
af_channelmap: fix uninitialized variable use introduced in ba8efac977
lavfi: add a bump and docs entries for the AVOptions switch
Conflicts:
Changelog
doc/APIchanges
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 11:20:55 +02:00
Stefano Sabatini
d2752ef061
lavfi/overlay: add process_command callback
2013-04-10 13:11:27 +02:00
Stefano Sabatini
006e20bd36
lavfi/overlay: add enable expression
...
This expression is useful to enable/disable overlaying on the fly.
Note that this can't be easily done relying on the filtergraph structure,
since this implies caching issues or a null frame overlaying in the best
case, which is better avoided for performance and convenience reasons.
2013-04-10 13:11:27 +02:00
Stefano Sabatini
cc3edd99a6
lavfi/overlay: add dynamic expression evaluation support
...
Add support for dynamic x, y expressions evaluation.
Also add support for an evaluation mode which allows to disable per-frame
evaluation, so that there is no speedloss in case the expression does not
depend on frame variables.
2013-04-10 13:11:27 +02:00
Michael Niedermayer
0594ef0dea
Merge commit 'b439c992c23f3e0f3832fffd2a34a664b236c525'
...
* commit 'b439c992c23f3e0f3832fffd2a34a664b236c525':
lavfi: switch to an AVOptions-based system.
dfa: implement missing TDLT coding method
Conflicts:
libavcodec/dfa.c
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 12:41:06 +02:00
Paul B Mahol
d0073c7a0b
separatefields filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-10 00:08:57 +00:00
Anton Khirnov
cdac3acb11
lavfi: add a bump and docs entries for the AVOptions switch
2013-04-09 19:13:27 +02:00
Anton Khirnov
b439c992c2
lavfi: switch to an AVOptions-based system.
2013-04-09 18:45:37 +02:00
Paul B Mahol
9dc88ac367
lavfi: remove noise libmpcodecs wrapper
...
Native filter have reached similar performance.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-08 20:57:59 +00:00
Paul B Mahol
bf65752848
aphaser filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-03 08:33:59 +00:00
Clément Bœsch
9371467d9d
lavfi/perms: add seed option.
2013-03-26 02:39:55 +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
Clément Bœsch
386dc9a3a8
lavfi/thumbnail: add support for named options.
2013-03-24 20:38:12 +01:00
Stefano Sabatini
1b140835b6
lavfi/colormatrix: add support for named options
2013-03-24 20:21:20 +01:00
Nicolas George
21b092de7c
lavfi: add sine audio source.
2013-03-20 21:04:28 +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
Clément Bœsch
76d1c07c89
lavfi/ebur128: add metadata injection.
2013-03-18 03:21:08 +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
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
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
Clément Bœsch
db670e5366
lavfi/ebur128: add framelog option.
2013-03-15 02:35:26 +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
Stefano Sabatini
ae732640ab
lavfi/cropdetect: add support for named options
2013-03-13 20:38:54 +01:00
Stefano Sabatini
aeac1dae29
lavfi/fieldorder: add support to named options
2013-03-13 00:37:13 +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
Stefano Sabatini
35135a3989
lavfi/smartblur: add support to named options
2013-03-10 16:38:45 +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
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
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
Clément Bœsch
34d0ea5247
lavfi/deshake: support named options.
2013-03-05 21:16:54 +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