mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-02 12:32:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

rpicamsrc: Attempt to workaround MMAL timeout bug

Browse source 
mmal_queue_timedwait() might spuriously return immediately
if called at exactly the wrong instant due to an internal
off-by-one bug. Attempt to work around that and just retry.
This commit is contained in:
Jan Schmidt 2018-07-16 19:49:21 +10:00 committed by Tim-Philipp Müller
parent c907deb15f
commit 3c5327ae64
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sys/rpicamsrc/RaspiCapture.c
View file

@ -937,9 +937,16 @@ raspi_capture_fill_buffer(RASPIVID_STATE *state, GstBuffer **bufp,
/* No timestamps if no clockm or invalid PTS */
GstClockTime gst_pts = GST_CLOCK_TIME_NONE;
/* FIXME: Use our own interruptible cond wait: */
buffer = mmal_queue_timedwait(state->encoded_buffer_q, 500);
do {
buffer = mmal_queue_timedwait(state->encoded_buffer_q, 500);
// Work around a bug where mmal_queue_timedwait() might return
// immediately if the internal timeout time aligns exactly
// with a 1 second rollover boundary by checking errno.
if (errno == EINVAL) {
GST_WARNING ("Retrying mmal_queue_timedwait() due to spurious failure.");
continue;
}
} while (0);
if (G_UNLIKELY(buffer == NULL)) {
return GST_FLOW_ERROR_TIMEOUT;