mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-03 21:25:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

avwait: Don't wait if audio_running_time_to_wait_for is NONE

Browse source 
The case is properly handled a few lines below by dropping the buffer.
We shouldn't perpetually block the audio chain function until the
target-timecode is reached.

https://bugzilla.gnome.org/show_bug.cgi?id=796906
This commit is contained in:
Vivia Nikolaidou 2018-08-01 15:11:09 +03:00
parent 60542ec970
commit 8ede252a8a
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst/timecode/gstavwait.c
View file

@ -836,15 +836,7 @@ gst_avwait_vsink_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
gst_avwait_send_element_message (self, TRUE, running_time);
} else if (running_time < self->running_time_to_wait_for
&& self->running_time_to_wait_for != GST_CLOCK_TIME_NONE) {
/* We should set audio_running_time_to_wait_for to a value far enough
* in the future, so that it will never be reached. However, setting
* it to GST_CLOCK_TIME_NONE would eternally trigger the g_cond_wait
* in the audio chain function, causing audio upstream to be queued up
* forever. There is already code in place to ensure that audio will
* not exceed the video at the same place, so we just set it to
* GST_CLOCK_TIME_NONE - 1 here to ensure it will never be reached,
* but still not trigger the eternal waiting code */
self->audio_running_time_to_wait_for = GST_CLOCK_TIME_NONE - 1;
self->audio_running_time_to_wait_for = GST_CLOCK_TIME_NONE;
}
}
/* Recording is FALSE: we drop all buffers */
@ -959,9 +951,7 @@ gst_avwait_asink_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
(video_running_time == GST_CLOCK_TIME_NONE
/* Wait if audio is after the video: dunno what to do */
|| gst_avwait_compare_guint64_with_signs (asign,
running_time_at_end, vsign, video_running_time) == 1
/* Wait if we don't even know what to wait for yet */
|| self->audio_running_time_to_wait_for == GST_CLOCK_TIME_NONE)) {
running_time_at_end, vsign, video_running_time) == 1)) {
g_cond_wait (&self->cond, &self->mutex);
vsign =
gst_segment_to_running_time_full (&self->vsegment, GST_FORMAT_TIME,