On Fri, 2022-01-07 at 15:36 +0800, Wenbin Chen wrote:
> From: nyanmisaka <nst799610...@gmail.com>
>
> mfxHDLPair was added to qsv, so modify qsv->opencl map function as well.
> Now the following commandline works:
>
> ffmpeg -v verbose -init_hw_device vaapi=va:/dev/dri/renderD128 \
> -init_hw_device qsv=qs@va -init_hw_device opencl=ocl@va -filter_hw_device ocl
> \
> -hwaccel qsv -hwaccel_output_format qsv -hwaccel_device qs -c:v h264_qsv \
> -i input.264 -vf "hwmap=derive_device=opencl,format=opencl,avgblur_opencl, \
> hwmap=derive_device=qsv:reverse=1:extra_hw_frames=32,format=qsv" \
> -c:v h264_qsv output.264
>
> Signed-off-by: nyanmisaka <nst799610...@gmail.com>
> Signed-off-by: Wenbin Chen <wenbin.c...@intel.com>
> ---
> libavutil/hwcontext_opencl.c | 14 +++++++++++++-
> libavutil/hwcontext_qsv.c | 34 ++++++++++++++++++++++++++++++++++
> 2 files changed, 47 insertions(+), 1 deletion(-)
>
> diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c
> index 26a3a24593..ceaef26f1c 100644
> --- a/libavutil/hwcontext_opencl.c
> +++ b/libavutil/hwcontext_opencl.c
> @@ -72,6 +72,12 @@
> #include "hwcontext_drm.h"
> #endif
>
> +#if HAVE_OPENCL_VAAPI_INTEL_MEDIA
> +extern int ff_qsv_get_surface_base_handle(mfxFrameSurface1 *surf,
> + enum AVHWDeviceType base_dev_typ,
> + void **base_handle);
> +#endif
opencl_vaapi_intel_media can be enabled without libmfx.
Thanks
Haihao
> +
>
> typedef struct OpenCLDeviceContext {
> // Default command queue to use for transfer/mapping operations on
> @@ -2248,8 +2254,14 @@ static int opencl_map_from_qsv(AVHWFramesContext
> *dst_fc, AVFrame *dst,
>
> #if CONFIG_LIBMFX
> if (src->format == AV_PIX_FMT_QSV) {
> + void *base_handle;
> mfxFrameSurface1 *mfx_surface = (mfxFrameSurface1*)src->data[3];
> - va_surface = *(VASurfaceID*)mfx_surface->Data.MemId;
> + err = ff_qsv_get_surface_base_handle(mfx_surface,
> + AV_HWDEVICE_TYPE_VAAPI,
> + &base_handle);
> + if (err < 0)
> + return err;
> + va_surface = *(VASurfaceID *)base_handle;
> } else
> #endif
> if (src->format == AV_PIX_FMT_VAAPI) {
> diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c
> index 853fb7f60d..6d9b8324c2 100644
> --- a/libavutil/hwcontext_qsv.c
> +++ b/libavutil/hwcontext_qsv.c
> @@ -112,6 +112,40 @@ static const struct {
> #endif
> };
>
> +extern int ff_qsv_get_surface_base_handle(mfxFrameSurface1 *surf,
> + enum AVHWDeviceType base_dev_type,
> + void **base_handle);
> +
> +/**
> + * Caller needs to allocate enough space for base_handle pointer.
> + **/
> +int ff_qsv_get_surface_base_handle(mfxFrameSurface1 *surf,
> + enum AVHWDeviceType base_dev_type,
> + void **base_handle)
> +{
> + mfxHDLPair *handle_pair;
> + handle_pair = surf->Data.MemId;
> + switch (base_dev_type) {
> +#if CONFIG_VAAPI
> + case AV_HWDEVICE_TYPE_VAAPI:
> + base_handle[0] = handle_pair->first;
> + return 0;
> +#endif
> +#if CONFIG_D3D11VA
> + case AV_HWDEVICE_TYPE_D3D11VA:
> + base_handle[0] = handle_pair->first;
> + base_handle[1] = handle_pair->secode;
> + return 0;
> +#endif
> +#if CONFIG_DXVA2
> + case AV_HWDEVICE_TYPE_DXVA2:
> + base_handle[0] = handle_pair->first;
> + return 0;
> +#endif
> + }
> + return AVERROR(EINVAL);
> +}
> +
> static uint32_t qsv_fourcc_from_pix_fmt(enum AVPixelFormat pix_fmt)
> {
> int i;
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
