mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

vdpaumpegdec: use mutex to protect mpeg_dec->seeking from concurrent access

Browse source
This commit is contained in:
Carl-Anton Ingmarsson 2009-06-07 01:12:50 +02:00 committed by Jan Schmidt
parent 3fa60712f2
commit 636ae49bee
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sys/vdpau/gstvdpmpegdec.c
View file

@ -840,10 +840,16 @@ normal_seek (GstVdpMpegDec * mpeg_dec, GstEvent * event)
gst_event_new_seek (rate, GST_FORMAT_BYTES, flags, gst_event_new_seek (rate, GST_FORMAT_BYTES, flags,
cur_type, bytes_cur, stop_type, bytes_stop); cur_type, bytes_cur, stop_type, bytes_stop);
mpeg_dec->seeking = TRUE; g_mutex_lock (mpeg_dec->mutex);
/* do the seek */ /* do the seek */
res = gst_pad_push_event (mpeg_dec->sink, peer_event); res = gst_pad_push_event (mpeg_dec->sink, peer_event);
if (res)
mpeg_dec->seeking = TRUE;
g_mutex_unlock (mpeg_dec->mutex);
} else } else
res = FALSE; res = FALSE;
@ -929,13 +935,16 @@ gst_vdp_mpeg_dec_sink_event (GstPad * pad, GstEvent * event)
stop, position); stop, position);
} }
g_mutex_lock (mpeg_dec->mutex);
/* if we seek ourselves we don't push out a newsegment now since we /* if we seek ourselves we don't push out a newsegment now since we
* use the calculated timestamp of the first frame for this */ * use the calculated timestamp of the first frame for this */
if (mpeg_dec->seeking) { if (mpeg_dec->seeking) {
gst_event_unref (event); gst_event_unref (event);
res = TRUE; res = TRUE;
g_mutex_unlock (mpeg_dec->mutex);
goto done; goto done;
} }
g_mutex_unlock (mpeg_dec->mutex);
convert_error: convert_error:
res = gst_pad_push_event (mpeg_dec->src, event); res = gst_pad_push_event (mpeg_dec->src, event);
@ -1069,6 +1078,8 @@ gst_vdp_mpeg_dec_init (GstVdpMpegDec * mpeg_dec, GstVdpMpegDecClass * gclass)
mpeg_dec->vdp_info.backward_reference = VDP_INVALID_HANDLE; mpeg_dec->vdp_info.backward_reference = VDP_INVALID_HANDLE;
gst_vdp_mpeg_dec_reset (mpeg_dec); gst_vdp_mpeg_dec_reset (mpeg_dec);
mpeg_dec->mutex = g_mutex_new ();
} }
static void static void
@ -1077,6 +1088,7 @@ gst_vdp_mpeg_dec_finalize (GObject * object)
GstVdpMpegDec *mpeg_dec = (GstVdpMpegDec *) object; GstVdpMpegDec *mpeg_dec = (GstVdpMpegDec *) object;
g_object_unref (mpeg_dec->adapter); g_object_unref (mpeg_dec->adapter);
g_mutex_free (mpeg_dec->mutex);
} }
static void static void

3
sys/vdpau/gstvdpmpegdec.h
View file

@ -78,6 +78,9 @@ struct _GstVdpMpegDec
GstSegment segment; GstSegment segment;
gboolean seeking; gboolean seeking;
gint64 byterate; gint64 byterate;
/* mutex */
GMutex *mutex;
}; };