diff options
| author | James Almer <jamrial@gmail.com> | 2018-04-13 20:34:23 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-04-13 20:34:23 -0300 |
| commit | f790410b6baa4ee53e8a5796e986de0cae78b073 (patch) | |
| tree | dc092d2c1bf35c8eb9888f7b3f77c4720bacf423 /libavfilter/vf_deinterlace_qsv.c | |
| parent | ae7e66fb4b1a256fb79a016b9c585de84ac77339 (diff) | |
| parent | cca5e4f040971db6de0bfe6968f00c021d8a9c42 (diff) | |
Merge commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42'
* commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42':
qsv: adding Multi Frame Encode support
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter/vf_deinterlace_qsv.c')
| -rw-r--r-- | libavfilter/vf_deinterlace_qsv.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavfilter/vf_deinterlace_qsv.c b/libavfilter/vf_deinterlace_qsv.c index 897e6bd622..c9e76c6056 100644 --- a/libavfilter/vf_deinterlace_qsv.c +++ b/libavfilter/vf_deinterlace_qsv.c @@ -35,6 +35,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/time.h" +#include "libavfilter/qsvvpp.h" #include "avfilter.h" #include "formats.h" @@ -215,6 +216,12 @@ static int init_out_session(AVFilterContext *ctx) return AVERROR_UNKNOWN; } + if (QSV_RUNTIME_VERSION_ATLEAST(ver, 1, 25)) { + err = MFXJoinSession(device_hwctx->session, s->session); + if (err != MFX_ERR_NONE) + return AVERROR_UNKNOWN; + } + memset(&par, 0, sizeof(par)); s->deint_conf.Header.BufferId = MFX_EXTBUFF_VPP_DEINTERLACING; |