FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

matroskademux: only seek when in proper state

Browse Source 
... and data structures can be thread-safely accessed.

See #601617.
This commit is contained in:
Mark Nauwelaerts 2010-03-23 17:47:48 +01:00
parent 9157c262ba
commit b1f3e4d0cf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gst/matroska/matroska-demux.c
View File

@ -2090,7 +2090,6 @@ gst_matroska_demux_send_event (GstMatroskaDemux * demux, GstEvent * event)
is_newsegment = (GST_EVENT_TYPE (event) == GST_EVENT_NEWSEGMENT); is_newsegment = (GST_EVENT_TYPE (event) == GST_EVENT_NEWSEGMENT);
/* FIXME: access to demux->src is not thread-safe here */
g_assert (demux->src->len == demux->num_streams); g_assert (demux->src->len == demux->num_streams);
for (i = 0; i < demux->src->len; i++) { for (i = 0; i < demux->src->len; i++) {
GstMatroskaTrackContext *stream; GstMatroskaTrackContext *stream;
@ -2153,7 +2152,6 @@ gst_matroska_demux_get_seek_track (GstMatroskaDemux * demux,
if (track && track->type == GST_MATROSKA_TRACK_TYPE_VIDEO) if (track && track->type == GST_MATROSKA_TRACK_TYPE_VIDEO)
return track; return track;
/* FIXME thread safety */
for (i = 0; i < demux->src->len; i++) { for (i = 0; i < demux->src->len; i++) {
GstMatroskaTrackContext *stream; GstMatroskaTrackContext *stream;
@ -2231,6 +2229,12 @@ gst_matroska_demux_handle_seek_event (GstMatroskaDemux * demux,
GstSegment seeksegment = { 0, }; GstSegment seeksegment = { 0, };
gboolean update; gboolean update;
/* no seeking until we are (safely) ready */
if (demux->state != GST_MATROSKA_DEMUX_STATE_DATA) {
GST_DEBUG_OBJECT (demux, "not ready for seeking yet");
return FALSE;
}
if (pad) if (pad)
track = gst_pad_get_element_private (pad); track = gst_pad_get_element_private (pad);