Commit 807a3b30 authored by Anton Khirnov's avatar Anton Khirnov Committed by Mark Thompson

lavfi: add a QSV scaling filter

This merges libav commit ac7bfd69,
which was previously skipped.

(cherry picked from commit ac7bfd69)
Signed-off-by: 's avatarMark Thompson <sw@jkqxz.net>
parent 210dd7bb
...@@ -26,6 +26,7 @@ version <next>: ...@@ -26,6 +26,7 @@ version <next>:
- native Opus encoder - native Opus encoder
- ScreenPressor decoder - ScreenPressor decoder
- incomplete ClearVideo decoder - incomplete ClearVideo decoder
- Intel QSV video scaling filter
version 3.2: version 3.2:
- libopenmpt demuxer - libopenmpt demuxer
......
...@@ -3127,6 +3127,7 @@ rubberband_filter_deps="librubberband" ...@@ -3127,6 +3127,7 @@ rubberband_filter_deps="librubberband"
sab_filter_deps="gpl swscale" sab_filter_deps="gpl swscale"
scale2ref_filter_deps="swscale" scale2ref_filter_deps="swscale"
scale_filter_deps="swscale" scale_filter_deps="swscale"
scale_qsv_filter_deps="libmfx"
select_filter_select="pixelutils" select_filter_select="pixelutils"
showcqt_filter_deps="avcodec avformat swscale" showcqt_filter_deps="avcodec avformat swscale"
showcqt_filter_select="fft" showcqt_filter_select="fft"
......
...@@ -94,7 +94,6 @@ Stuff that didn't reach the codebase: ...@@ -94,7 +94,6 @@ Stuff that didn't reach the codebase:
- a853388d2 hevc: change the stride of the MC buffer to be in bytes instead of elements - a853388d2 hevc: change the stride of the MC buffer to be in bytes instead of elements
- 0cef06df0 checkasm: add HEVC MC tests - 0cef06df0 checkasm: add HEVC MC tests
- e7078e842 hevcdsp: add x86 SIMD for MC - e7078e842 hevcdsp: add x86 SIMD for MC
- QSV scaling filter (62c58c5)
Collateral damage that needs work locally: Collateral damage that needs work locally:
------------------------------------------ ------------------------------------------
......
...@@ -261,6 +261,7 @@ OBJS-$(CONFIG_ROTATE_FILTER) += vf_rotate.o ...@@ -261,6 +261,7 @@ OBJS-$(CONFIG_ROTATE_FILTER) += vf_rotate.o
OBJS-$(CONFIG_SAB_FILTER) += vf_sab.o OBJS-$(CONFIG_SAB_FILTER) += vf_sab.o
OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o scale.o OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o scale.o
OBJS-$(CONFIG_SCALE_NPP_FILTER) += vf_scale_npp.o scale.o OBJS-$(CONFIG_SCALE_NPP_FILTER) += vf_scale_npp.o scale.o
OBJS-$(CONFIG_SCALE_QSV_FILTER) += vf_scale_qsv.o
OBJS-$(CONFIG_SCALE_VAAPI_FILTER) += vf_scale_vaapi.o scale.o OBJS-$(CONFIG_SCALE_VAAPI_FILTER) += vf_scale_vaapi.o scale.o
OBJS-$(CONFIG_SCALE2REF_FILTER) += vf_scale.o scale.o OBJS-$(CONFIG_SCALE2REF_FILTER) += vf_scale.o scale.o
OBJS-$(CONFIG_SELECT_FILTER) += f_select.o OBJS-$(CONFIG_SELECT_FILTER) += f_select.o
......
...@@ -271,6 +271,7 @@ static void register_all(void) ...@@ -271,6 +271,7 @@ static void register_all(void)
REGISTER_FILTER(SAB, sab, vf); REGISTER_FILTER(SAB, sab, vf);
REGISTER_FILTER(SCALE, scale, vf); REGISTER_FILTER(SCALE, scale, vf);
REGISTER_FILTER(SCALE_NPP, scale_npp, vf); REGISTER_FILTER(SCALE_NPP, scale_npp, vf);
REGISTER_FILTER(SCALE_QSV, scale_qsv, vf);
REGISTER_FILTER(SCALE_VAAPI, scale_vaapi, vf); REGISTER_FILTER(SCALE_VAAPI, scale_vaapi, vf);
REGISTER_FILTER(SCALE2REF, scale2ref, vf); REGISTER_FILTER(SCALE2REF, scale2ref, vf);
REGISTER_FILTER(SELECT, select, vf); REGISTER_FILTER(SELECT, select, vf);
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVFILTER_VERSION_MAJOR 6 #define LIBAVFILTER_VERSION_MAJOR 6
#define LIBAVFILTER_VERSION_MINOR 74 #define LIBAVFILTER_VERSION_MINOR 75
#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_MICRO 100
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment