summaryrefslogtreecommitdiff
path: root/libavfilter/af_channelmap.c
Commit message (Collapse)AuthorAge
* avfilter: convert to new channel layout APIJames Almer2022-03-15
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avfilter: Replace query_formats callback with union of list and callbackAndreas Rheinhardt2021-10-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If one looks at the many query_formats callbacks in existence, one will immediately recognize that there is one type of default callback for video and a slightly different default callback for audio: It is "return ff_set_common_formats_from_list(ctx, pix_fmts);" for video with a filter-specific pix_fmts list. For audio, it is the same with a filter-specific sample_fmts list together with ff_set_common_all_samplerates() and ff_set_common_all_channel_counts(). This commit allows to remove the boilerplate query_formats callbacks by replacing said callback with a union consisting the old callback and pointers for pixel and sample format arrays. For the not uncommon case in which these lists only contain a single entry (besides the sentinel) enum AVPixelFormat and enum AVSampleFormat fields are also added to the union to store them directly in the AVFilter, thereby avoiding a relocation. The state of said union will be contained in a new, dedicated AVFilter field (the nb_inputs and nb_outputs fields have been shrunk to uint8_t in order to create a hole for this new field; this is no problem, as the maximum of all the nb_inputs is four; for nb_outputs it is only two). The state's default value coincides with the earlier default of query_formats being unset, namely that the filter accepts all formats (and also sample rates and channel counts/layouts for audio) provided that these properties agree coincide for all inputs and outputs. By using different union members for audio and video filters the type-unsafety of using the same functions for audio and video lists will furthermore be more confined to formats.c than before. When the new fields are used, they will also avoid allocations: Currently something nearly equivalent to ff_default_query_formats() is called after every successful call to a query_formats callback; yet in the common case that the newly allocated AVFilterFormats are not used at all (namely if there are no free links) these newly allocated AVFilterFormats are freed again without ever being used. Filters no longer using the callback will not exhibit this any more. Reviewed-by: Paul B Mahol <onemda@gmail.com> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
* Replace all occurences of av_mallocz_array() by av_calloc()Andreas Rheinhardt2021-09-20
| | | | | | | They do the same. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
* avfilter/avfilter: Add numbers of (in|out)pads directly to AVFilterAndreas Rheinhardt2021-08-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up until now, an AVFilter's lists of input and output AVFilterPads were terminated by a sentinel and the only way to get the length of these lists was by using avfilter_pad_count(). This has two drawbacks: first, sizeof(AVFilterPad) is not negligible (i.e. 64B on 64bit systems); second, getting the size involves a function call instead of just reading the data. This commit therefore changes this. The sentinels are removed and new private fields nb_inputs and nb_outputs are added to AVFilter that contain the number of elements of the respective AVFilterPad array. Given that AVFilter.(in|out)puts are the only arrays of zero-terminated AVFilterPads an API user has access to (AVFilterContext.(in|out)put_pads are not zero-terminated and they already have a size field) the argument to avfilter_pad_count() is always one of these lists, so it just has to find the filter the list belongs to and read said number. This is slower than before, but a replacement function that just reads the internal numbers that users are expected to switch to will be added soon; and furthermore, avfilter_pad_count() is probably never called in hot loops anyway. This saves about 49KiB from the binary; notice that these sentinels are not in .bss despite being zeroed: they are in .data.rel.ro due to the non-sentinels. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
* avfilter/internal: Replace AVFilterPad.needs_writable by flagsAndreas Rheinhardt2021-08-17
| | | | | | | It will be useful in the future when more flags are added. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
* avfilter/formats: Factor common function combinations outAndreas Rheinhardt2021-08-13
| | | | | | | | | | | Several combinations of functions happen quite often in query_format functions; e.g. ff_set_common_formats(ctx, ff_make_format_list(sample_fmts)) is very common. This commit therefore adds functions that are equivalent to commonly used function combinations in order to reduce code duplication. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
* avfilter: Constify all AVFiltersAndreas Rheinhardt2021-04-27
| | | | | | | This is possible now that the next-API is gone. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: James Almer <jamrial@gmail.com>
* 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/af_channelmap: Fix double-free of AVFilterChannelLayouts on errorAndreas Rheinhardt2020-08-23
| | | | | | | | | | | | | | | | | | | | | The query_formats function of the channelmap filter tries to allocate a list of channel layouts which on success are attached to more permanent objects (an AVFilterLink) for storage afterwards. If attaching succeeds, the link becomes one of the common owners (in this case, the only owner) of the list. Yet if the list has been successfully attached to the link and an error happens lateron, the list was manually freed, which is wrong, because it is owned by its link so that the link's pointer to the list will become dangling and there will be a double-free/use-after-free when the link is later cleaned up automatically. This commit fixes this by removing the custom freeing code; this will temporarily add a leaking codepath (if attaching the list fails, the list will leak), but this will be fixed soon by making sure that an AVFilterChannelLayouts without owner will be automatically freed when attaching it to an AVFilterLink fails. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* Merge commit '88fd836a015a5f3380df74592e440e7d1e5b8000'James Almer2017-10-21
|\ | | | | | | | | | | | | * commit '88fd836a015a5f3380df74592e440e7d1e5b8000': lavfi: Drop deprecated way of passing options for a few filters Merged-by: James Almer <jamrial@gmail.com>
| * lavfi: Drop deprecated way of passing options for a few filtersVittorio Giovara2017-03-23
| | | | | | | | Deprecated in 02/2013.
* | avfilter: do not use AVFrame accessorMuhammad Faiz2017-04-23
| | | | | | | | | | Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* | avfilter/af_channelmap: add support for unknown input channel layoutsMarton Balint2016-12-10
| | | | | | | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* | lavfi/af_channelmap: fix memory leakGanesh 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 1338330. Reviewed-by: Paul B Mahol <onemda@gmail.com> 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/af_channelmap: Reorder operations to avoid memleakMichael Niedermayer2015-09-04
| | | | | | | | | | Fixes CID1322346 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4'Michael Niedermayer2015-07-23
|\| | | | | | | | | | | | | | | | | | | | | * commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4': af_channelmap: properly set the supported output channel layouts Conflicts: libavfilter/af_channelmap.c See: 39867f3e098ab304cd3bef0ace19d73617cdb817 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * af_channelmap: properly set the supported output channel layoutsAnton Khirnov2015-07-23
| | | | | | | | | | | | | | | | | | | | The current code expects query_formats() to be called exactly once, it will leak if it's not called at all (filter initialized, but never configured or used) or try to read freed memory if it's called more than once. Found-by: James Almer <jamrial@gmail.com> CC: libav-stable@libav.org
* | avfilter/af_channelmap: Move ff_add_channel_layout() call to querry_format()Michael Niedermayer2015-07-21
| | | | | | | | | | | | Avoids memleak if querry_formats is not called Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | af_channelmap: fix number of channelsMarton Balint2015-03-28
| | | | | | | | | | | | | | | | | | | | Fixes segfaults with the following command: ffmpeg -f lavfi -i aevalsrc=0:c=stereo:n=1920 -af 'channelmap=0' test.ac3 Signed-off-by: Marton Balint <cus@passwd.hu> Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/af_channelmap: Move potential dereference after NULL check in ↵Michael Niedermayer2015-02-18
| | | | | | | | | | | | | | | | get_channel_idx() Fixes CID1270822 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/af_channelmap: Check for missing argument in get_channel_idx()Michael Niedermayer2015-01-23
| | | | | | | | | | | | Fixes null pointer dereference Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavfilter/af_channelmap: avoid derreferencing possible nullReynaldo H. Verdejo Pinochet2014-09-26
| | | | | | | | | | | | | | | | ff_all_channel_layouts() might return null on alloc failure. Fixes CID1241517 Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | Merge commit 'f0e959481968b6d906931127237ed981b6414f6e'Michael Niedermayer2014-08-02
|\| | | | | | | | | | | | | * commit 'f0e959481968b6d906931127237ed981b6414f6e': af_channelmap: Set the frame channel layout Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_channelmap: Set the frame channel layoutLuca Barbato2014-08-02
| | | | | | | | | | Otherwise the frame would show the first layout matching the channel count.
* | avfilter/af_channelmap: Use av_mallocz_array()Michael Niedermayer2014-06-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e843612695007cc623813073754c651ab43021f7'Michael Niedermayer2014-03-16
|\| | | | | | | | | | | | | * commit 'e843612695007cc623813073754c651ab43021f7': af_channelmap: fix ONE_STR mapping mode Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_channelmap: fix ONE_STR mapping modeAnton Khirnov2014-03-16
| | | | | | | | | | | | get_channel() returns 0 on success CC:libav-stable@libav.org
* | 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
| |
* | avfilter: various cosmeticsPaul B Mahol2013-09-12
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi/channelmap: make use of AVFILTER_DEFINE_CLASSPaul B Mahol2013-05-27
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8'Michael Niedermayer2013-05-01
|\| | | | | | | | | | | | | | | * commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8': graphparser: only print filter arguments if they are non-NULL af_channelmap: ensure the output channel layout is valid. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_channelmap: ensure the output channel layout is valid.Anton Khirnov2013-04-30
| |
* | Merge commit '949c603ed9210df0e1b8e1aa82c71b93543d8071'Michael Niedermayer2013-05-01
|\| | | | | | | | | | | | | | | | | | | | | * commit '949c603ed9210df0e1b8e1aa82c71b93543d8071': af_channelmap: remove now unnecessary goto vf_split: fix description Conflicts: libavfilter/split.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_channelmap: remove now unnecessary gotoAnton Khirnov2013-04-30
| | | | | | | | | | Options are freed from the generic code now, there is no need to call av_opt_free() from the filter.
* | Merge commit 'c0771a1ac6da697f86e3b10c8fe5dbc2ee92e347'Michael Niedermayer2013-04-17
|\| | | | | | | | | | | | | * commit 'c0771a1ac6da697f86e3b10c8fe5dbc2ee92e347': af_channelmap: cosmetics, use an extra local variable to shorten the code Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_channelmap: cosmetics, use an extra local variable to shorten the codeAnton Khirnov2013-04-17
| |
* | Merge commit 'aafed1175df76603e94c99a7748968780d6548d2'Michael Niedermayer2013-04-17
|\| | | | | | | | | | | | | * commit 'aafed1175df76603e94c99a7748968780d6548d2': af_channelmap: sanity check input channel indices in all cases. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_channelmap: sanity check input channel indices in all cases.Anton Khirnov2013-04-17
| | | | | | | | | | | | Fixes invalid reads from non-existing channels. CC:libav-stable@libav.org
| * af_channelmap: fix uninitialized variable use introduced in ↵Anton Khirnov2013-04-09
| | | | | | | | ba8efac977f4276f05274947b2b67d144cbc965a
| * lavfi: remove now unused args parameter from AVFilter.initAnton Khirnov2013-04-09
| |
* | lavfi: remove now unused args parameter from AVFilter.initAnton Khirnov2013-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libavfilter/avfilter.c libavfilter/vf_drawtext.c libavfilter/vf_lut.c libavfilter/vf_select.c libavfilter/vf_setpts.c libavfilter/vsrc_color.c libavfilter/vsrc_movie.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ba8efac977f4276f05274947b2b67d144cbc965a'Michael Niedermayer2013-04-11
|\| | | | | | | | | | | | | | | | | | | | | * commit 'ba8efac977f4276f05274947b2b67d144cbc965a': af_channelmap: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/af_channelmap.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_channelmap: switch to an AVOptions-based system.Anton Khirnov2013-04-09
| |
* | 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.
* | Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Use the avstring.h locale-independent character type functionsReimar Döffinger2013-03-07
| | | | | | | | | | | | Make sure the behavior does not change with the locale. Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-23 20:55:30 +0000