mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-08 23:42:28 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapiencode: fix possible hang on SIGINT.

Browse source 
vaapiencode might hang when the pipeline is stopped without any EOS,
e.g. when <Ctrl>+C is pressed, thus causing the srcpad task to keep
running and locked. This fixes a possible deadlock on state change
from PAUSED to READY.

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

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
This commit is contained in:
Wind Yuan 2013-12-17 04:23:42 -05:00 committed by Gwenole Beauchesne
parent d3b672411d
commit 830566c17e
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst/vaapi/gstvaapiencode.c
View file

@ -595,6 +595,22 @@ gst_vaapiencode_finish (GstVideoEncoder * venc)
return ret; return ret;
} }
static GstStateChangeReturn
gst_vaapiencode_change_state (GstElement * element, GstStateChange transition)
{
GstVaapiEncode *const encode = GST_VAAPIENCODE_CAST (element);
switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_pad_stop_task (GST_VAAPI_PLUGIN_BASE_SRC_PAD (encode));
break;
default:
break;
}
return GST_ELEMENT_CLASS (gst_vaapiencode_parent_class)->
change_state (element, transition);
}
#if GST_CHECK_VERSION(1,0,0) #if GST_CHECK_VERSION(1,0,0)
static gboolean static gboolean
gst_vaapiencode_propose_allocation (GstVideoEncoder * venc, GstQuery * query) gst_vaapiencode_propose_allocation (GstVideoEncoder * venc, GstQuery * query)
@ -639,6 +655,7 @@ static void
gst_vaapiencode_class_init (GstVaapiEncodeClass * klass) gst_vaapiencode_class_init (GstVaapiEncodeClass * klass)
{ {
GObjectClass *const object_class = G_OBJECT_CLASS (klass); GObjectClass *const object_class = G_OBJECT_CLASS (klass);
GstElementClass *const element_class = GST_ELEMENT_CLASS (klass);
GstVideoEncoderClass *const venc_class = GST_VIDEO_ENCODER_CLASS (klass); GstVideoEncoderClass *const venc_class = GST_VIDEO_ENCODER_CLASS (klass);
GST_DEBUG_CATEGORY_INIT (gst_vaapiencode_debug, GST_DEBUG_CATEGORY_INIT (gst_vaapiencode_debug,
@ -648,6 +665,9 @@ gst_vaapiencode_class_init (GstVaapiEncodeClass * klass)
object_class->finalize = gst_vaapiencode_finalize; object_class->finalize = gst_vaapiencode_finalize;
element_class->change_state =
GST_DEBUG_FUNCPTR (gst_vaapiencode_change_state);
venc_class->open = GST_DEBUG_FUNCPTR (gst_vaapiencode_open); venc_class->open = GST_DEBUG_FUNCPTR (gst_vaapiencode_open);
venc_class->close = GST_DEBUG_FUNCPTR (gst_vaapiencode_close); venc_class->close = GST_DEBUG_FUNCPTR (gst_vaapiencode_close);
venc_class->set_format = GST_DEBUG_FUNCPTR (gst_vaapiencode_set_format); venc_class->set_format = GST_DEBUG_FUNCPTR (gst_vaapiencode_set_format);