mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 04:36:20 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtmux: Don't lock object lock twice in prefill mode

Browse source 
Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/762

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/663>
This commit is contained in:
Sebastian Dröge 2020-07-07 12:36:01 +03:00
parent 31ff328727
commit 54bc0157b5
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst/isomp4/gstqtmux.c
View file

@ -2727,6 +2727,7 @@ prefill_raw_audio_prepare_buf_func (GstQTMuxPad * qtpad, GstBuffer * buf,
return buf; return buf;
} }
/* Must be called with object lock */
static void static void
find_video_sample_duration (GstQTMux * qtmux, guint * dur_n, guint * dur_d) find_video_sample_duration (GstQTMux * qtmux, guint * dur_n, guint * dur_d)
{ {
@ -2734,7 +2735,6 @@ find_video_sample_duration (GstQTMux * qtmux, guint * dur_n, guint * dur_d)
/* Find the (first) video track and assume that we have to output /* Find the (first) video track and assume that we have to output
* in that size */ * in that size */
GST_OBJECT_LOCK (qtmux);
for (l = GST_ELEMENT_CAST (qtmux)->sinkpads; l; l = l->next) { for (l = GST_ELEMENT_CAST (qtmux)->sinkpads; l; l = l->next) {
GstQTMuxPad *tmp_qpad = (GstQTMuxPad *) l->data; GstQTMuxPad *tmp_qpad = (GstQTMuxPad *) l->data;
@ -2744,7 +2744,6 @@ find_video_sample_duration (GstQTMux * qtmux, guint * dur_n, guint * dur_d)
break; break;
} }
} }
GST_OBJECT_UNLOCK (qtmux);
if (l == NULL) { if (l == NULL) {
GST_INFO_OBJECT (qtmux, GST_INFO_OBJECT (qtmux,