Browse Source

libavutil/hwcontext_qsv: fix a bug for mapping qsv frame to vaapi

Command below failed.
ffmpeg -v verbose -init_hw_device vaapi=va:/dev/dri/renderD128
-init_hw_device qsv=qs@va -hwaccel qsv -hwaccel_device qs
-filter_hw_device va -c:v h264_qsv
-i 1080P.264 -vf "hwmap,format=vaapi" -c:v h264_vaapi output.264

Cause: Assign pair->first directly to data[3] in vaapi frame.
pair->first is *VASurfaceID while data[3] in vaapi frame is
VASurfaceID. I fix this line of code. Now the command above works.

Signed-off-by: Wenbin Chen <wenbin.chen@intel.com>
master
Wenbin Chen 1 month ago
committed by James Almer
parent
commit
f2891fbded
  1. 6
      libavutil/hwcontext_qsv.c

6
libavutil/hwcontext_qsv.c

@ -781,7 +781,11 @@ static int qsv_map_from(AVHWFramesContext *ctx,
case AV_HWDEVICE_TYPE_VAAPI:
{
mfxHDLPair *pair = (mfxHDLPair*)surf->Data.MemId;
child_data = pair->first;
/* pair->first is *VASurfaceID while data[3] in vaapi frame is VASurfaceID, so
* we need this casting for vaapi.
* Add intptr_t to force cast from VASurfaceID(uint) type to pointer(long) type
* to avoid compile warning */
child_data = (uint8_t*)(intptr_t)*(VASurfaceID*)pair->first;
break;
}
#endif

Loading…
Cancel
Save