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

omxvideoenc: Fix deadlock caused by calling reset while the loop function does something with the base video codec stream lock

Browse source
This commit is contained in:
Sebastian Dröge 2011-10-20 15:20:47 +02:00
parent cf6f14d03c
commit 6689faa661
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
omx/gstomxvideoenc.c
View file

@ -990,21 +990,25 @@ gst_omx_video_enc_reset (GstBaseVideoEncoder * encoder)
/* FIXME: Workaround for /* FIXME: Workaround for
* https://bugzilla.gnome.org/show_bug.cgi?id=654529 * https://bugzilla.gnome.org/show_bug.cgi?id=654529
*
* This is always called with GST_BASE_VIDEO_CODEC_STREAM_LOCK
*/ */
GST_BASE_VIDEO_CODEC_STREAM_LOCK (self);
g_list_foreach (GST_BASE_VIDEO_CODEC (self)->frames, g_list_foreach (GST_BASE_VIDEO_CODEC (self)->frames,
(GFunc) gst_base_video_codec_free_frame, NULL); (GFunc) gst_base_video_codec_free_frame, NULL);
g_list_free (GST_BASE_VIDEO_CODEC (self)->frames); g_list_free (GST_BASE_VIDEO_CODEC (self)->frames);
GST_BASE_VIDEO_CODEC (self)->frames = NULL; GST_BASE_VIDEO_CODEC (self)->frames = NULL;
GST_BASE_VIDEO_CODEC_STREAM_UNLOCK (self);
if (self->started) { if (self->started) {
gst_omx_port_set_flushing (self->in_port, TRUE); gst_omx_port_set_flushing (self->in_port, TRUE);
gst_omx_port_set_flushing (self->out_port, TRUE); gst_omx_port_set_flushing (self->out_port, TRUE);
/* Wait until the srcpad loop is finished */ /* Wait until the srcpad loop is finished,
* unlock GST_BASE_VIDEO_CODEC_STREAM_LOCK to prevent deadlocks
* caused by using this lock from inside the loop function */
GST_BASE_VIDEO_CODEC_STREAM_UNLOCK (self);
GST_PAD_STREAM_LOCK (GST_BASE_VIDEO_CODEC_SRC_PAD (self)); GST_PAD_STREAM_LOCK (GST_BASE_VIDEO_CODEC_SRC_PAD (self));
GST_PAD_STREAM_UNLOCK (GST_BASE_VIDEO_CODEC_SRC_PAD (self)); GST_PAD_STREAM_UNLOCK (GST_BASE_VIDEO_CODEC_SRC_PAD (self));
GST_BASE_VIDEO_CODEC_STREAM_LOCK (self);
gst_omx_port_set_flushing (self->in_port, FALSE); gst_omx_port_set_flushing (self->in_port, FALSE);
gst_omx_port_set_flushing (self->out_port, FALSE); gst_omx_port_set_flushing (self->out_port, FALSE);