projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a183892
)
splitmuxsink: Drop lock when sending dummy event
author
Jan Schmidt
<jan@centricular.com>
Sun, 17 Jul 2016 14:12:55 +0000
(
00:12
+1000)
committer
Jan Schmidt
<jan@centricular.com>
Tue, 19 Jul 2016 14:32:30 +0000
(
00:32
+1000)
When pushing the dummy event into the multiqueue,
drop the splitmux lock or else we might deadlock.
gst/multifile/gstsplitmuxsink.c
patch
|
blob
|
history
diff --git
a/gst/multifile/gstsplitmuxsink.c
b/gst/multifile/gstsplitmuxsink.c
index
88fdce0
..
f76b8f1
100644
(file)
--- a/
gst/multifile/gstsplitmuxsink.c
+++ b/
gst/multifile/gstsplitmuxsink.c
@@
-1196,7
+1196,10
@@
handle_mq_input (GstPad * pad, GstPadProbeInfo * info, MqStreamCtx * ctx)
GST_EVENT_TYPE_SERIALIZED,
gst_structure_new ("splitmuxsink-unblock", "timestamp",
G_TYPE_UINT64, splitmux->max_in_running_time, NULL));
+
+ GST_SPLITMUX_UNLOCK (splitmux);
gst_pad_send_event (ctx->sinkpad, event);
+ GST_SPLITMUX_LOCK (splitmux);
/* fallthrough */
}
case SPLITMUX_STATE_START_NEXT_FRAGMENT: