summaryrefslogtreecommitdiff
path: root/libavfilter/vf_overlay.c
Commit message (Collapse)AuthorAge
* avutil: Rename FF_CEIL_COMPAT to AV_CEIL_COMPATDerek Buitenhuis2016-01-27
| | | | | | | | | | Libav, for some reason, merged this as a public API function. This will aid in future merges. A define is left for backwards compat, just in case some person used it, since it is in a public header. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* vf_overlay: handles expression evaluation of frame size change in ↵Bela Bodecs2016-01-19
| | | | | | | | | | | | | | | frame-by-frame evalutaion mode vf_overlay video filter accepts expressions in its parameters. In 'frame-by-frame' evaluation mode it recalculates them regularly, but incoming video frame size changes did not reflect in their values. So if you used width or height of any source videos in expressions as parameters, they stayed on their initial values. This patch corrects this bug. Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu> Reviewed-by: Paul B Mahol <onemda@gmail.com Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavfi/vf_overlay: fix unitialized pointersGanesh Ajjanagadde2015-12-10
| | | | | | | Missed in commit 301c2784b35036945cd9a7049808deecce149916. Found-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* lavfi/vf_overlay: fix memory leaksGanesh Ajjanagadde2015-12-09
| | | | | | | | | | | | | | | | | Recent commits 6aaac24d72a7da631173209841a3944fcb4a3309 and 3835554bf8ed78539a3492c239f979c0ab03a15f made progress towards cleaning up usage of the formats API, and in particular fixed possible NULL pointer dereferences. This commit addresses the issue of possible resource leaks when some intermediate call fails. Tested with valgrind --leak-check=full --show-leak-kinds=all, and manual simulation of malloc/realloc failures. Fixes: CID 1338327. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* avfilter/all: propagate errors of functions from avfilter/formatsGanesh Ajjanagadde2015-10-14
| | | | | | | | | | | | | | | | | | Many of the functions from avfilter/formats can return errors, usually AVERROR(ENOMEM). This propagates the return values. All of these were found by using av_warn_unused_result, demonstrating its utility. Tested with FATE. I am least sure of the changes to avfilter/filtergraph, since I don't know what/how reduce_format is intended to behave and how it should react to errors. Fixes: CID 1325680, 1325679, 1325678. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Previous version Reviewed-by: Nicolas George <george@nsup.org> Previous version Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* avfilter/overlay: use AV_OPT_TYPE_BOOL for rgb, shortest and repeatlast optionsClément Bœsch2015-09-09
|
* avfilter/vf_overlay: Change enums to int, which are accessed via AVOption as intMichael Niedermayer2015-03-20
| | | | | | This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Add missing "const" all over the place.Reimar Döffinger2014-08-29
| | | | | | Only "./configure --enable-gpl" on x86 was tested. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* lavfi/overlay: show incoming frames on debug messagesStefano Sabatini2014-07-02
| | | | | | | | | | | This is especially useful to debug queue overflow issues. Ideally we should be able to set the debug message at the dualinput/framesync level, but they do not have the information related to the filter context and the inlink, so cannot access much useful information. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* avfilter/overlay: reindentClément Bœsch2014-06-29
|
* Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'Michael Niedermayer2014-04-19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '58400ac133bcfb6bf8196b4e5208bc178307739b': lavfi: name anonymous structs Conflicts: libavfilter/buffersink.c libavfilter/f_select.c libavfilter/src_movie.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_overlay.c libavfilter/vf_showinfo.c libavfilter/vf_unsharp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: name anonymous structsVittorio Giovara2014-04-19
| |
* | Merge commit 'de203abd71baae7f120313259b45cf935c85203e'Michael Niedermayer2014-02-04
|\| | | | | | | | | | | | | | | | | | | | | * commit 'de203abd71baae7f120313259b45cf935c85203e': vf_overlay: add eof_action switch Conflicts: doc/filters.texi libavfilter/vf_overlay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_overlay: add eof_action switchKeith Lawson2014-02-04
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | lavfi/overlay: add yuv422 format modeStefano Sabatini2014-02-02
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavfi: do not export the filters from shared objects Conflicts: libavfilter/af_amix.c libavfilter/af_anull.c libavfilter/asrc_anullsrc.c libavfilter/f_select.c libavfilter/f_settb.c libavfilter/split.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_colorbalance.c libavfilter/vf_copy.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_drawbox.c libavfilter/vf_format.c libavfilter/vf_framestep.c libavfilter/vf_frei0r.c libavfilter/vf_hflip.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_null.c libavfilter/vf_overlay.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_vflip.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: do not export the filters from shared objectsAnton Khirnov2013-10-28
| |
* | lavfi/overlay: correct small error in intersection detectionBenedict Endemann2013-10-27
| | | | | | | | | | | | | | | | | | The image size of the destination image was used to determine if a source image was positioned outside the destination image, that no intersection could occur. Actually for these two cases the size of the source image has to be used! Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | avfilter/dualinput: simplifyPaul B Mahol2013-09-30
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi/dualinput: reimplement on top of framesync.Nicolas George2013-09-23
| |
* | avfilter: remove duplicate includesMichael Niedermayer2013-09-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: various cosmeticsPaul B Mahol2013-09-12
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter: remove redundant .get_(audio/video)_buffer initializationsPaul B Mahol2013-09-07
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi/overlay: remove do_blend forward declaration.Clément Bœsch2013-05-27
| |
* | lavfi: add dual input helpers.Clément Bœsch2013-05-27
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vf_pad: use the name 's' for the pointer to the private context vf_overlay: use the name 's' for the pointer to the private context vf_lut: use the name 's' for the pointer to the private context Conflicts: libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_overlay: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
* | lavfi: replace passthrough_filter_frame with a flag.Clément Bœsch2013-05-12
| | | | | | | | | | | | | | | | | | | | With the introduction of AVFilterContext->is_disabled, we can simplify the custom passthrough mode in filters. This commit is technically a small compat break, but the timeline was introduced very recently. Doxy by Stefano Sabatini.
* | lavfi/overlay: simpler up-rounded w/h computations.Clément Bœsch2013-05-09
| |
* | lavfi/overlay: reindent fix.Clément Bœsch2013-05-07
| |
* | lavfi/overlay: support timeline through the new system.Clément Bœsch2013-04-23
| |
* | lavfi: add frame counter into AVFilterLink and use it in filters.Clément Bœsch2013-04-23
| |
* | lavfi: remove now unused args parameter from AVFilter.init and init_opaqueMichael Niedermayer2013-04-12
| | | | | | | | | | | | | | | | | | This is mostly automated global search and replace The deprecated aconvert filter is disabled, if it still has users it should be updated Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/overlay: improve feedback in case of invalid expressionStefano Sabatini2013-04-12
| | | | | | | | Based on vf_hue.c code.
* | lavfi/overlay: fix crash in case of invalid expressionStefano Sabatini2013-04-12
| |
* | lavfi/overlay: add repeatlast optionStefano Sabatini2013-04-12
| |
* | lavfi/overlay: reindent constants in option listStefano Sabatini2013-04-12
| | | | | | | | Wanted-By: ubitux
* | lavfi/overlay: cleanup unused shorthand.Clément Bœsch2013-04-11
| |
* | lavfi/overlay: remove dupe initializerPaul B Mahol2013-04-10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '9087eaf193b8ce99c41352064a81916fa66adb49'Michael Niedermayer2013-04-10
|\| | | | | | | | | | | | | | | | | | | | | * commit '9087eaf193b8ce99c41352064a81916fa66adb49': vf_overlay: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_overlay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_overlay: switch to an AVOptions-based system.Anton Khirnov2013-04-09
| |
* | lavfi/overlay: add process_command callbackStefano Sabatini2013-04-10
| |
* | lavfi/overlay: add enable expressionStefano Sabatini2013-04-10
| | | | | | | | | | | | | | | | 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.
* | lavfi/overlay: add dynamic expression evaluation supportStefano Sabatini2013-04-10
| | | | | | | | | | | | | | | | 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.
* | lavfi/overlay: fix debug PTS output in try_filter_frame()Stefano Sabatini2013-03-31
| | | | | | | | | | The PTS of the input frames must be interpreted according to the input timebase, which is not the same as the output timebase.
* | lavfi/overlay: use standard options parsing.Clément Bœsch2013-03-24
| |
* | lavfi: remove remaining forgotten min/rej perms.Clément Bœsch2013-03-10
| |
* | Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer2013-03-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 759001c534287a96dc96d1e274665feb7059145d 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>
| * lavfi: switch to AVFrame.Anton Khirnov2013-03-08
| | | | | | | | | | Deprecate AVFilterBuffer/AVFilterBufferRef and everything related to it and use AVFrame instead.
| * lavfi: merge start_frame/draw_slice/end_frameAnton Khirnov2012-11-28
| | | | | | | | | | Any alleged performance benefits gained from the split are purely mythological and do not justify added code complexity.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-19 21:28:50 +0000