mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 05:59:10 +00:00
Code Issues 1 Projects Releases Wiki Activity

msdkvpp: fix an issue which causes dangling pointer

Browse source 
Put all the external buffer structures into thiz to avoid being freed
early.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5377>
This commit is contained in:
Tong Wu 2023-09-21 20:34:02 +08:00
parent f7cb79874a
commit 57bfbf51b2
2 changed files with 43 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
subprojects/gst-plugins-bad/sys/msdk/gstmsdkvpp.c
View file

@ -1108,83 +1108,81 @@ ensure_filters (GstMsdkVPP * thiz)
if (MFX_RUNTIME_VERSION_ATLEAST (thiz->version, 2, 0)) { if (MFX_RUNTIME_VERSION_ATLEAST (thiz->version, 2, 0)) {
GstVideoInfo *in_vinfo = &thiz->sinkpad_info; GstVideoInfo *in_vinfo = &thiz->sinkpad_info;
GstVideoInfo *out_vinfo = &thiz->srcpad_info; GstVideoInfo *out_vinfo = &thiz->srcpad_info;
mfxExtVideoSignalInfo in_vsi, out_vsi; mfxExtVideoSignalInfo *in_vsi = &thiz->in_vsi;
mfxExtMasteringDisplayColourVolume mdcv; mfxExtVideoSignalInfo *out_vsi = &thiz->out_vsi;
mfxExtContentLightLevelInfo cll; mfxExtMasteringDisplayColourVolume *mdcv = &thiz->mdcv;
mfxExtContentLightLevelInfo *cll = &thiz->cll;
const guint chroma_den = 50000; const guint chroma_den = 50000;
const guint luma_den = 10000; const guint luma_den = 10000;
gint tmap = 0; gint tmap = 0;
if (in_vinfo->colorimetry.primaries || in_vinfo->colorimetry.transfer if (in_vinfo->colorimetry.primaries || in_vinfo->colorimetry.transfer
|| in_vinfo->colorimetry.matrix || in_vinfo->colorimetry.range) { || in_vinfo->colorimetry.matrix || in_vinfo->colorimetry.range) {
memset (&in_vsi, 0, sizeof (mfxExtVideoSignalInfo)); in_vsi->Header.BufferId = MFX_EXTBUFF_VIDEO_SIGNAL_INFO_IN;
in_vsi.Header.BufferId = MFX_EXTBUFF_VIDEO_SIGNAL_INFO_IN; in_vsi->Header.BufferSz = sizeof (in_vsi);
in_vsi.Header.BufferSz = sizeof (in_vsi); in_vsi->ColourDescriptionPresent = 1;
in_vsi.ColourDescriptionPresent = 1; in_vsi->VideoFullRange =
in_vsi.VideoFullRange =
(in_vinfo->colorimetry.range == GST_VIDEO_COLOR_RANGE_0_255); (in_vinfo->colorimetry.range == GST_VIDEO_COLOR_RANGE_0_255);
in_vsi.ColourPrimaries = in_vsi->ColourPrimaries =
gst_video_color_primaries_to_iso (in_vinfo->colorimetry.primaries); gst_video_color_primaries_to_iso (in_vinfo->colorimetry.primaries);
in_vsi.TransferCharacteristics = in_vsi->TransferCharacteristics =
gst_video_transfer_function_to_iso (in_vinfo->colorimetry.transfer); gst_video_transfer_function_to_iso (in_vinfo->colorimetry.transfer);
in_vsi.MatrixCoefficients = in_vsi->MatrixCoefficients =
gst_video_color_matrix_to_iso (in_vinfo->colorimetry.matrix); gst_video_color_matrix_to_iso (in_vinfo->colorimetry.matrix);
gst_msdkvpp_add_extra_param (thiz, (mfxExtBuffer *) & in_vsi); gst_msdkvpp_add_extra_param (thiz, (mfxExtBuffer *) in_vsi);
} }
if (thiz->hdr_tone_mapping) { if (thiz->hdr_tone_mapping) {
if (thiz->have_mdcv) { if (thiz->have_mdcv) {
memset (&mdcv, 0, sizeof (mfxExtMasteringDisplayColourVolume)); mdcv->Header.BufferId = MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME_IN;
mdcv.Header.BufferId = MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME_IN; mdcv->Header.BufferSz = sizeof (mfxExtMasteringDisplayColourVolume);
mdcv.Header.BufferSz = sizeof (mfxExtMasteringDisplayColourVolume);
mdcv.DisplayPrimariesX[0] = mdcv->DisplayPrimariesX[0] =
MIN ((thiz->mdcv_info.display_primaries[1].x * chroma_den), MIN ((thiz->mdcv_info.display_primaries[1].x * chroma_den),
chroma_den); chroma_den);
mdcv.DisplayPrimariesY[0] = mdcv->DisplayPrimariesY[0] =
MIN ((thiz->mdcv_info.display_primaries[1].y * chroma_den), MIN ((thiz->mdcv_info.display_primaries[1].y * chroma_den),
chroma_den); chroma_den);
mdcv.DisplayPrimariesX[1] = mdcv->DisplayPrimariesX[1] =
MIN ((thiz->mdcv_info.display_primaries[2].x * chroma_den), MIN ((thiz->mdcv_info.display_primaries[2].x * chroma_den),
chroma_den); chroma_den);
mdcv.DisplayPrimariesY[1] = mdcv->DisplayPrimariesY[1] =
MIN ((thiz->mdcv_info.display_primaries[2].y * chroma_den), MIN ((thiz->mdcv_info.display_primaries[2].y * chroma_den),
chroma_den); chroma_den);
mdcv.DisplayPrimariesX[2] = mdcv->DisplayPrimariesX[2] =
MIN ((thiz->mdcv_info.display_primaries[0].x * chroma_den), MIN ((thiz->mdcv_info.display_primaries[0].x * chroma_den),
chroma_den); chroma_den);
mdcv.DisplayPrimariesY[2] = mdcv->DisplayPrimariesY[2] =
MIN ((thiz->mdcv_info.display_primaries[0].y * chroma_den), MIN ((thiz->mdcv_info.display_primaries[0].y * chroma_den),
chroma_den); chroma_den);
mdcv.WhitePointX = mdcv->WhitePointX =
MIN ((thiz->mdcv_info.white_point.x * chroma_den), chroma_den); MIN ((thiz->mdcv_info.white_point.x * chroma_den), chroma_den);
mdcv.WhitePointY = mdcv->WhitePointY =
MIN ((thiz->mdcv_info.white_point.y * chroma_den), chroma_den); MIN ((thiz->mdcv_info.white_point.y * chroma_den), chroma_den);
/* From vpl spec, MaxDisplayMasteringLuminance is in the unit of 1 nits, /* From vpl spec, MaxDisplayMasteringLuminance is in the unit of 1 nits,
* MinDisplayMasteringLuminance is in the unit of 0.0001 nits. * MinDisplayMasteringLuminance is in the unit of 0.0001 nits.
*/ */
mdcv.MaxDisplayMasteringLuminance = mdcv->MaxDisplayMasteringLuminance =
thiz->mdcv_info.max_display_mastering_luminance; thiz->mdcv_info.max_display_mastering_luminance;
mdcv.MinDisplayMasteringLuminance = mdcv->MinDisplayMasteringLuminance =
thiz->mdcv_info.min_display_mastering_luminance * luma_den; thiz->mdcv_info.min_display_mastering_luminance * luma_den;
gst_msdkvpp_add_extra_param (thiz, (mfxExtBuffer *) & mdcv); gst_msdkvpp_add_extra_param (thiz, (mfxExtBuffer *) mdcv);
tmap = 1; tmap = 1;
} }
if (thiz->have_cll) { if (thiz->have_cll) {
memset (&cll, 0, sizeof (mfxExtContentLightLevelInfo)); cll->Header.BufferId = MFX_EXTBUFF_CONTENT_LIGHT_LEVEL_INFO;
cll.Header.BufferId = MFX_EXTBUFF_CONTENT_LIGHT_LEVEL_INFO; cll->Header.BufferSz = sizeof (mfxExtContentLightLevelInfo);
cll.Header.BufferSz = sizeof (mfxExtContentLightLevelInfo);
cll.MaxContentLightLevel = cll->MaxContentLightLevel =
MIN (thiz->cll_info.max_content_light_level, 65535); MIN (thiz->cll_info.max_content_light_level, 65535);
cll.MaxPicAverageLightLevel = cll->MaxPicAverageLightLevel =
MIN (thiz->cll_info.max_frame_average_light_level, 65535); MIN (thiz->cll_info.max_frame_average_light_level, 65535);
gst_msdkvpp_add_extra_param (thiz, (mfxExtBuffer *) & cll); gst_msdkvpp_add_extra_param (thiz, (mfxExtBuffer *) cll);
tmap = 1; tmap = 1;
} }
} }
@ -1198,19 +1196,18 @@ ensure_filters (GstMsdkVPP * thiz)
if (out_vinfo->colorimetry.primaries || out_vinfo->colorimetry.transfer if (out_vinfo->colorimetry.primaries || out_vinfo->colorimetry.transfer
|| out_vinfo->colorimetry.matrix || out_vinfo->colorimetry.range) { || out_vinfo->colorimetry.matrix || out_vinfo->colorimetry.range) {
memset (&out_vsi, 0, sizeof (mfxExtVideoSignalInfo)); out_vsi->Header.BufferId = MFX_EXTBUFF_VIDEO_SIGNAL_INFO_OUT;
out_vsi.Header.BufferId = MFX_EXTBUFF_VIDEO_SIGNAL_INFO_OUT; out_vsi->Header.BufferSz = sizeof (out_vsi);
out_vsi.Header.BufferSz = sizeof (out_vsi); out_vsi->ColourDescriptionPresent = 1;
out_vsi.ColourDescriptionPresent = 1; out_vsi->VideoFullRange =
out_vsi.VideoFullRange =
(out_vinfo->colorimetry.range == GST_VIDEO_COLOR_RANGE_0_255); (out_vinfo->colorimetry.range == GST_VIDEO_COLOR_RANGE_0_255);
out_vsi.ColourPrimaries = out_vsi->ColourPrimaries =
gst_video_color_primaries_to_iso (out_vinfo->colorimetry.primaries); gst_video_color_primaries_to_iso (out_vinfo->colorimetry.primaries);
out_vsi.TransferCharacteristics = out_vsi->TransferCharacteristics =
gst_video_transfer_function_to_iso (out_vinfo->colorimetry.transfer); gst_video_transfer_function_to_iso (out_vinfo->colorimetry.transfer);
out_vsi.MatrixCoefficients = out_vsi->MatrixCoefficients =
gst_video_color_matrix_to_iso (out_vinfo->colorimetry.matrix); gst_video_color_matrix_to_iso (out_vinfo->colorimetry.matrix);
gst_msdkvpp_add_extra_param (thiz, (mfxExtBuffer *) & out_vsi); gst_msdkvpp_add_extra_param (thiz, (mfxExtBuffer *) out_vsi);
} }
} }
#endif #endif

5
subprojects/gst-plugins-bad/sys/msdk/gstmsdkvpp.h
View file

@ -135,6 +135,11 @@ struct _GstMsdkVPP
mfxExtBuffer *extra_params[MAX_EXTRA_PARAMS]; mfxExtBuffer *extra_params[MAX_EXTRA_PARAMS];
guint num_extra_params; guint num_extra_params;
mfxExtVideoSignalInfo in_vsi;
mfxExtVideoSignalInfo out_vsi;
mfxExtMasteringDisplayColourVolume mdcv;
mfxExtContentLightLevelInfo cll;
mfxFrameAllocRequest request[2]; mfxFrameAllocRequest request[2];
GList* locked_in_surfaces; GList* locked_in_surfaces;
GList* locked_out_surfaces; GList* locked_out_surfaces;