diff options
| author | Haihao Xiang <haihao.xiang@intel.com> | 2024-03-11 12:56:02 +0800 |
|---|---|---|
| committer | Haihao Xiang <haihao.xiang@intel.com> | 2024-03-18 12:00:14 +0800 |
| commit | 74a8e080d021b6c88677b35d879d269bfc4f93fb (patch) | |
| tree | f9e4b5f4b40a254890642115563f8786fe730e3b /libavutil | |
| parent | 697251bb0c9ea4b66276cf89e1e526535a86d117 (diff) | |
| download | ffmpeg-74a8e080d021b6c88677b35d879d269bfc4f93fb.tar.gz | |
lavu/hwcontext_qsv: Join the download/upload session to the main session
This may reduce the number of internal threads when using hwupload or
hwdownload filter.
Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/hwcontext_qsv.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 378cd5e826..e5e043d2d1 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -55,6 +55,10 @@ (MFX_VERSION_MAJOR > (MAJOR) || \ MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR)) +#define QSV_RUNTIME_VERSION_ATLEAST(MFX_VERSION, MAJOR, MINOR) \ + ((MFX_VERSION.Major > (MAJOR)) || \ + (MFX_VERSION.Major == (MAJOR) && MFX_VERSION.Minor >= (MINOR))) + #define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl)) #define QSV_ONEVPL QSV_VERSION_ATLEAST(2, 0) #define QSV_HAVE_OPAQUE !QSV_ONEVPL @@ -1136,6 +1140,17 @@ static int qsv_init_internal_session(AVHWFramesContext *ctx, int ret = AVERROR_UNKNOWN; /* hwctx->loader is non-NULL for oneVPL user and NULL for non-oneVPL user */ void **loader = &hwctx->loader; + mfxSession parent_session = hwctx->session; + mfxIMPL impl; + mfxVersion ver; + + err = MFXQueryIMPL(parent_session, &impl); + if (err == MFX_ERR_NONE) + err = MFXQueryVersion(parent_session, &ver); + if (err != MFX_ERR_NONE) { + av_log(ctx, AV_LOG_ERROR, "Error querying the session attributes.\n"); + return AVERROR_UNKNOWN; + } #if QSV_HAVE_OPAQUE QSVFramesContext *s = ctx->hwctx; @@ -1156,6 +1171,15 @@ static int qsv_init_internal_session(AVHWFramesContext *ctx, } } + if (QSV_RUNTIME_VERSION_ATLEAST(ver, 1, 25)) { + err = MFXJoinSession(parent_session, *session); + if (err != MFX_ERR_NONE) { + av_log(ctx, AV_LOG_ERROR, "Error joining session.\n"); + ret = AVERROR_UNKNOWN; + goto fail; + } + } + if (!opaque) { err = MFXVideoCORE_SetFrameAllocator(*session, &frame_allocator); if (err != MFX_ERR_NONE) { |