summaryrefslogtreecommitdiff
path: root/libavfilter/vf_scale_vaapi.c
Commit message (Collapse)AuthorAge
* 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>
* Remove unnecessary avassert.h inclusionsAndreas Rheinhardt2021-07-22
| | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
* Remove unnecessary mem.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>
* lavfi/vf_*_vaapi: Fix error caseMark Thompson2020-02-09
| | | | Fixes CID 1452400, 1452416, 1452550, 1452590, 1452760.
* avfilter: rename scale.c,h to scale_evalGyan Doshi2019-12-10
| | | | scale.c is too generic; scale_eval is more representative
* avfilter/scale.c: factorize ff_scale_eval_dimensionsGyan Doshi2019-12-08
| | | | | | | Adjustment of evaluated values shifted to ff_adjust_scale_dimensions Shifted code for force_original_aspect_ratio and force_divisble_by from vf_scale so it is now available for scale_cuda, scale_npp and scale_vaapi as well.
* vf_scale_vaapi: Add options to configure output colour propertiesMark Thompson2019-06-02
| | | | | The "out_color_matrix" and "out_range" properties match the same options in vf_scale; the others attempt to follow the same pattern.
* lavfi/vaapi: Improve support for colour propertiesMark Thompson2019-06-02
| | | | | | Attempts to pick the set of supported colour properties best matching the input. Output is then set with the same values, except for the colour matrix which may change when converting between RGB and YUV.
* lavfi/vaapi: Factorise out common code for parameter buffer setupMark Thompson2019-06-02
| | | | | Also enables cropping on all VAAPI filters, inherited from the existing support in scale_vaapi.
* lavfi/vaapi: Add constant VAAPI_VPP_BACKGROUND_BLACKZachary Zhou2018-12-30
| | | | | Signed-off-by: Zachary Zhou <zachary.zhou@intel.com> Signed-off-by: Mark Thompson <sw@jkqxz.net>
* lavfi/vf_scale_vaapi: add scaling mode setting support.Jun Zhao2018-12-10
| | | | | | | | | | | | | before this change, scale_vaapi hard coding the scaling mode, add a new option "mode" to setting the scaling mode, it can be use to change scaling algorithm for performance/quality trade off. Note: VA_FILTER_SCALING_NL_ANAMORPHIC(nolinear ananorphic scaling algorithm) doesn't support by i965/iHD driver now, add this just for completeness. Reviewed-by: Mark Thompson <sw@jkqxz.net> Signed-off-by: Jun Zhao <mypopydev@gmail.com>
* vf_scale_vaapi: Apply cropping rectangle to inputMark Thompson2018-03-22
|
* lavfi/vf_xxx_vaapi: fix typo.Jun Zhao2018-01-24
| | | | Signed-off-by: Jun Zhao <jun.zhao@intel.com>
* lavfi: use common VAAPI VPP infrastructure for vf_scale_vaapi.Jun Zhao2018-01-21
| | | | | Signed-off-by: Jun Zhao <jun.zhao@intel.com> Signed-off-by: Mark Thompson <sw@jkqxz.net>
* lavfi/vf_scale_vaapi: set output SARRodger Combs2018-01-18
|
* vaapi: Always free parameter buffers after vaEndPicture() with libva2Mark Thompson2017-10-09
| | | | | | This is an ABI change in libva2: previously the Intel driver had this behaviour and it was implemented as a driver quirk, but now it is part of the specification so all drivers must do it.
* Merge commit 'e3fb74f7f9a8f1895381355f40c92cac3c1023d9'Matthieu Bouron2017-03-30
|\ | | | | | | | | | | | | * commit 'e3fb74f7f9a8f1895381355f40c92cac3c1023d9': lavfi: Always propagate hw_frames_ctx through links Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
| * lavfi: Always propagate hw_frames_ctx through linksMark Thompson2016-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds a new flag to mark filters which are aware of hwframes and will perform this task themselves, and marks all appropriate filters with this flag. This is required to allow software-mapped hardware frames to work, because we need to have the frames context available for any later mapping operation in the filter graph. The output from the filter graph should only propagate further to an encoder if the hardware format actually matches the visible format (mapped frames are valid here and have an hw_frames_ctx, but this should not be given to the encoder as its hardware context).
* | Merge commit '7e2561fa8313982aa21f7657953eedeeb33b210d'Matthieu Bouron2017-03-29
|\| | | | | | | | | | | | | | | * commit '7e2561fa8313982aa21f7657953eedeeb33b210d': lavfi: Use ff_get_video_buffer in all filters using hwframes vf_hwupload_cuda: Fix build error Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
| * lavfi: Use ff_get_video_buffer in all filters using hwframesMark Thompson2016-11-02
| |
* | Merge commit 'bdf7610eb266fd3de650040c97328791868abd82'Clément Bœsch2017-03-20
|\| | | | | | | | | | | | | * commit 'bdf7610eb266fd3de650040c97328791868abd82': vf_scale_vaapi: Crop input surface to active region Merged-by: Clément Bœsch <u@pkh.me>
| * vf_scale_vaapi: Crop input surface to active regionMark Thompson2016-09-14
| | | | | | | | | | | | If the input has been decoded from a stream which uses edge cropping then the whole surface need not be valid. This defines an input region for the scaler so we only use the active area of the frame.
| * vf_scale_vaapi: Respect driver quirks around buffer destructionMark Thompson2016-07-02
| |
* | vf_scale_vaapi: Add missing return value checksMark Thompson2017-02-05
| | | | | | | | Fixes CID 1374119.
* | avfilter/scale: refactor common code for scaling height/width expressionsAman Gupta2017-02-02
| | | | | | | | | | | | | | Implements support for height/width expressions in vf_scale_vaapi, by refactoring common code into a new libavfilter/scale.c Signed-off-by: Mark Thompson <sw@jkqxz.net>
* | vf_scale_vaapi: Respect driver quirks around buffer destructionMark Thompson2016-11-13
| | | | | | | | (cherry picked from commit 582d4211e00015b68626f77ce4af53161e2b1713)
* | avfilter: Add AV_OPT_FLAG_FILTERING_PARAM to where it was missingMichael Niedermayer2016-04-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '98114d70e48caf871b0fe9b8e5bf8ebd989b845d'Derek Buitenhuis2016-04-18
|/ | | | | | | * commit '98114d70e48caf871b0fe9b8e5bf8ebd989b845d': lavf: VAAPI scale filter Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* lavf: VAAPI scale filterMark Thompson2016-03-23
Signed-off-by: Anton Khirnov <anton@khirnov.net>