summaryrefslogtreecommitdiff
path: root/libavfilter/vf_overlay.c
Commit message (Collapse)AuthorAge
* lavfi: regroup formats lists in a single structure.Nicolas George2020-09-08
| | | | | | | | | | | | | | | It will allow to refernce it as a whole without clunky macros. Most of the changes have been automatically made with sed: sed -i ' s/-> *in_formats/->incfg.formats/g; s/-> *out_formats/->outcfg.formats/g; s/-> *in_channel_layouts/->incfg.channel_layouts/g; s/-> *out_channel_layouts/->outcfg.channel_layouts/g; s/-> *in_samplerates/->incfg.samplerates/g; s/-> *out_samplerates/->outcfg.samplerates/g; ' src/libavfilter/*(.)
* avfilter/vf_overlay: Fix double-free of AVFilterFormats on errorAndreas Rheinhardt2020-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | The query_formats function of the overlay filter tries to allocate two lists (only one in a special case) of formats which on success are attached to more permanent objects (AVFilterLinks) for storage afterwards. If attaching a list to an AVFilterLink succeeds, it is in turn owned by the AVFilterLink (or more exactly, the AVFilterLink becomes one of the common owners of the list). Yet if attaching a list to one of its links succeeds and an error happens lateron, both lists were manually freed, whic is wrong if the list is already owned by one or more links; these links' pointers to their lists will become dangling and there will be a double-free/use-after-free when these links are cleaned up automatically. This commit fixes this by removing the custom freeing code; this will temporarily add a leaking codepath (if attaching a list not already owned by a link to a link fails, the list will leak), but this will be fixed soon by making sure that an AVFilterFormats without owner will be automatically freed when attaching it to an AVFilterLink fails. Notice that at most one list leaks because a new list is only allocated after the old list has been successfully attached to a link. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avfilter/vf_overlay: Remove superfluous ;Andreas Rheinhardt2020-08-21
| | | | | | | | | | | | | | | | In a function body, a redundant ; is just a null statement that does nothing. Yet outside a function body, a superfluous ';' like one that exists if one adds a ';' immediately after a function body's closing brace is actually invalid C that compilers happen to accept. Yet when compiled in -pedantic mode, both GCC as well as Clang emit warnings for this like "ISO C does not allow extra ‘;’ outside of a function [-Wpedantic]". The scenario described above existed in vf_overlay.c as a result of macro expansion. This commit fixes it. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avfilter/vf_overlay: add yuv420p10 and yuv422p10 10bit format supportLimin Wang2020-06-19
| | | | Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
* avfilter/vf_overlay: support for 8bit and 10bit overlay with macro-based ↵Limin Wang2020-06-19
| | | | | | function Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
* remove CHAR_MIN/CHAR_MAX usagePaul B Mahol2020-03-17
| | | | It is not needed at all.
* avfilter/vf_overlay: fix filtering with negative yPaul B Mahol2018-12-03
|
* avfilter/vf_overlay: fix crash with negative yPaul B Mahol2018-11-20
|
* avfilter/vf_overlay: exclude nv12/nv21 formats from x86 asm checkPaul B Mahol2018-05-03
| | | | | | They are yet to be supported, Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_overlay: add x86 SIMDPaul B Mahol2018-05-02
| | | | | | | Specifically for yuv444, yuv422, yuv420 format when main stream has no alpha, and alpha is straight. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_overlay: use slice_end in alpha_composite()Paul B Mahol2018-04-29
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_overlay: add slice threadingPaul B Mahol2018-04-28
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter: add comments for duplicate lineSteven Liu2018-02-01
| | | | | | | | | comment about the looks like a duplicate line. but that is used to reason x is expressed from y Suggested-by: Paul B Mahol Suggested-by: Michael Niedermayer Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avfilter/vf_overlay: fix packed_rgb caseMateusz2017-12-18
| | | | Signed-off-by: Mateusz Brzostek <mateuszb@poczta.onet.pl>
* avfilter/vf_overlay: add premultiplied alpha modePaul B Mahol2017-12-16
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavfi: rename framesync2 to framesync.Nicolas George2017-09-12
|
* avfilter/vf_overlay: Restore shorthand option orderMichael Niedermayer2017-09-05
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavfi/vf_overlay: use framesync2 options.Nicolas George2017-08-29
|
* lavfi/vf_overlay: move to framesync2.Nicolas George2017-08-29
|
* avfilter/vf_overlay: fix alpha blending for planar formats with a ↵Marton Balint2017-08-10
| | | | | | | | | | | | | | | | transparent background When the background had an alpha channel, the old code in blend_plane calculated premultiplied alpha from the destination plane colors instead of the destination alpha. Also the calculation of the output alpha should only happen after the color planes are already finished. Fixes output of: ffplay -f lavfi "testsrc2=alpha=32[a];color=black[b];[b][a]overlay[out0]" Signed-off-by: Marton Balint <cus@passwd.hu>
* avfilter/vf_overlay: separate functions with main alphaPaul B Mahol2017-06-25
| | | | | | ~5-15% faster overall with main input without alpha. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_overlay: remove rgb optionPaul B Mahol2017-06-24
| | | | | | Its been deprecated for over 3 years. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_overlay: add auto format modePaul B Mahol2017-06-24
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter: do not use AVFrame accessorMuhammad Faiz2017-04-23
| | | | | Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* avfilter/overlay: add gbrp output formatPaul B Mahol2017-01-31
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavfi: split frame_count between input and output.Nicolas George2016-11-13
| | | | | | | | | | | | AVFilterLink.frame_count is supposed to count the number of frames that were passed on the link, but with min_samples, that number is not always the same for the source and destination filters. With the addition of a FIFO on the link, the difference will become more significant. Split the variable in two: frame_count_in counts the number of frames that entered the link, frame_count_out counts the number of frames that were sent to the destination filter.
* lavfi/vf_overlay: support NV12 and NV21Rodger Combs2016-10-26
| | | | Tested-by: Michael on x86-32/64 linux, mingw, mips/arm qemu linux
* avfilter/vf_overlay: add YUVA422P to alpha_pix_fmtsPaul B Mahol2016-09-17
| | | | | | Now yuv422 output format gives similar expected output as other output formats. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_overlay: support J formats tooPaul B Mahol2016-09-17
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_overlay: inline yuv output formatsPaul B Mahol2016-09-11
| | | | | | Overall speedup ~10-20% Tested-by: Michael on mingw32 mingw64 linux32 mips and arm
* avfilter/vf_overlay: split blend_image into functions for each overlay formatPaul B Mahol2016-09-11
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch2016-06-21
|\ | | | | | | | | | | | | * commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
| * cosmetics: Fix spelling mistakesVittorio Giovara2016-05-04
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | 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
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-31 01:20:14 +0000