mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-04 05:22:30 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapidecode: Don't crash if a buffer outlives the decoder

Browse source 
Sometimes, for example, when switching video streams but keeping
the same sink, the surface will be released after the decoder is
stopped and replaced. This caused a crash because the release
callback was called on an invalid pointer.
The patch adding an additional reference to the decoder object in the buffer.

https://bugzilla.gnome.org/show_bug.cgi?id=745189

Signed-off-by: Olivier Crete <olivier.crete@collabora.com>
Signed-off-by: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
This commit is contained in:
Olivier Crete 2015-03-06 15:20:01 +02:00 committed by Sreerenj Balachandran
parent 7e19e6a00a
commit 8f56b758b6
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gst/vaapi/gstvaapidecode.c
View file

@ -253,6 +253,7 @@ gst_vaapidecode_release (GstVaapiDecode * decode)
g_mutex_lock (&decode->surface_ready_mutex);
g_cond_signal (&decode->surface_ready);
g_mutex_unlock (&decode->surface_ready_mutex);
gst_object_unref (decode);
}
static GstFlowReturn
@ -272,7 +273,7 @@ gst_vaapidecode_push_decoded_frame (GstVideoDecoder * vdec,
proxy = gst_video_codec_frame_get_user_data (out_frame);
gst_vaapi_surface_proxy_set_destroy_notify (proxy,
(GDestroyNotify) gst_vaapidecode_release, decode);
(GDestroyNotify) gst_vaapidecode_release, gst_object_ref (decode));
#if GST_CHECK_VERSION(1,0,0)
ret = gst_video_decoder_allocate_output_frame (vdec, out_frame);
@ -645,7 +646,7 @@ gst_vaapidecode_destroy (GstVaapiDecode * decode)
decode->active = FALSE;
gst_vaapidecode_release (decode);
gst_vaapidecode_release (gst_object_ref (decode));
}
static gboolean