summaryrefslogtreecommitdiff
path: root/libavfilter/vf_zoompan.c
Commit message (Collapse)AuthorAge
* avfilter: Reindentation after query_formats changesAndreas Rheinhardt2021-10-05
| | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
* avfilter/vf_zoompan: Use formats list instead of query functionAndreas Rheinhardt2021-10-05
| | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.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>
* 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/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>
* Remove unnecessary avassert.h inclusionsAndreas Rheinhardt2021-07-22
| | | | 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>
* avfilter/zoompan: add in_time variableexwm2020-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the zoompan filter exposes a 'time' variable (missing from docs) for use in the 'zoom', 'x', and 'y' expressions. This variable is perhaps better named 'out_time' as it represents the timestamp in seconds of each output frame produced by zoompan. This patch adds aliases 'out_time' and 'ot' for 'time'. This patch also adds an 'in_time' (alias 'it') variable that provides access to the timestamp in seconds of each input frame to the zoompan filter. This helps to design zoompan filters that depend on the input video timestamps. For example, it makes it easy to zoom in instantly for only some portion of a video. Both the 'out_time' and 'in_time' variables have been added in the documentation for zoompan. Example usage of 'in_time' in the zoompan filter to zoom in 2x for the first second of the input video and 1x for the rest: zoompan=z='if(between(in_time,0,1),2,1):d=1' V2: Fix zoompan filter documentation stating that the time variable would be NAN if the input timestamp is unknown. V3: Add 'it' alias for 'in_time. Add 'out_time' and 'ot' aliases for 'time'. Minor corrections to zoompan docs. Signed-off-by: exwm <thighsman@protonmail.com>
* avfilter/vf_zoompan: fix leaksPaul B Mahol2019-09-25
|
* avfilter/vf_zoompan: forward status back from output to inputPaul B Mahol2019-09-25
|
* avfilter/vf_zoompan: do not increase VAR_IN twice, also count from 0Paul B Mahol2018-06-03
| | | | | | Fixes #7242. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_zoompan: fix specific corner case when no frame was ever ↵Paul B Mahol2017-09-07
| | | | | | | requested from input Reported-by: Nicolas George Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_zoompan: remove AVFILTER_FLAG_SUPPORT_TIMELINE_GENERICMichael Niedermayer2017-08-27
| | | | | | | Suggested-by: <durandal_1707> Fixes: assertion failure Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/vf_zoompan: parse zoom,x and y expression during initializationPaul B Mahol2017-08-27
| | | | | | Fixes #6127. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_zoompan: switch to activatePaul B Mahol2017-08-27
| | | | | | Fixes #5182. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_zoompan: Free out frame on errorMichael Niedermayer2017-03-31
| | | | | | | Fixes: CID1398578 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* 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.
* avfilter/vf_zoompan: fix pzoom usagePaul B Mahol2016-08-15
|
* avfilter: Fix max value of AV_OPT_TYPE_VIDEO_RATEMichael Niedermayer2016-06-09
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/vf_zoompan: Initialize retMichael Niedermayer2016-02-12
| | | | | | | Silences: CID1351394 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/vf_zoompan: Fix use of uninitialized variablesMichael Niedermayer2016-02-12
| | | | | | | | | Fixes: CID1351392 Fixes: CID1351393 Fixes: CID1351395 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/vf_zoompan: Remove dead storeMichael Niedermayer2016-02-12
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* 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>
* avfilter/vf_zoompan: fix pts handlingPaul B Mahol2016-01-24
| | | | | | Now output pts have some sense. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_zoompan: unbreak filtering with video inputPaul B Mahol2016-01-24
| | | | | | | Inserting fifo appears to be working solution to not get filter_frame request we do not want. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_zoompan: rewrite so it doesn't cache all output framesPaul B Mahol2016-01-24
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_zoompan: do not free frame we pushed to lavfiPaul B Mahol2016-01-02
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_zoompan: support planar rgb pixel formatsPaul B Mahol2015-06-12
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_zoompan: free out AVFrame on failureMichael Niedermayer2015-05-13
| | | | | | | Fixes: CID1197065 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter: handle error in query_formats() in bunch of filtersPaul B Mahol2015-04-08
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_zoompan: fix mixing of declarations and statementsMichael Niedermayer2014-06-09
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Zoom & Pan filterPaul B Mahol2014-06-09
Signed-off-by: Paul B Mahol <onemda@gmail.com>