mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-30 12:10:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoaggregator: fix broken locking in update_src_caps function

Browse source 
We would unlock an already-unlocked mutex that we never re-locked.

https://bugzilla.gnome.org/show_bug.cgi?id=732750
This commit is contained in:
Tim-Philipp Müller 2014-07-06 22:16:48 +01:00
parent 551122c19a
commit 341dc8aecf
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst-libs/gst/video/gstvideoaggregator.c
View file

@ -555,7 +555,6 @@ gst_videoaggregator_update_src_caps (GstVideoAggregator * vagg)
best_fps_d = fps_d; best_fps_d = fps_d;
} }
} }
GST_OBJECT_UNLOCK (vagg);
if (best_fps_n <= 0 || best_fps_d <= 0 || best_fps == 0.0) { if (best_fps_n <= 0 || best_fps_d <= 0 || best_fps == 0.0) {
best_fps_n = 25; best_fps_n = 25;
@ -583,6 +582,8 @@ gst_videoaggregator_update_src_caps (GstVideoAggregator * vagg)
info.par_n = GST_VIDEO_INFO_PAR_N (&vagg->info); info.par_n = GST_VIDEO_INFO_PAR_N (&vagg->info);
info.par_d = GST_VIDEO_INFO_PAR_D (&vagg->info); info.par_d = GST_VIDEO_INFO_PAR_D (&vagg->info);
GST_OBJECT_UNLOCK (vagg);
if (vagg_klass->update_info) { if (vagg_klass->update_info) {
if (!vagg_klass->update_info (vagg, &info)) { if (!vagg_klass->update_info (vagg, &info)) {
ret = FALSE; ret = FALSE;
@ -594,6 +595,9 @@ gst_videoaggregator_update_src_caps (GstVideoAggregator * vagg)
caps = gst_video_info_to_caps (&info); caps = gst_video_info_to_caps (&info);
peercaps = gst_pad_peer_query_caps (agg->srcpad, NULL); peercaps = gst_pad_peer_query_caps (agg->srcpad, NULL);
GST_OBJECT_LOCK (vagg);
if (peercaps) { if (peercaps) {
GstCaps *tmp; GstCaps *tmp;