summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2024-03-13 12:49:41 +0000
committerTim-Philipp Müller <tim@centricular.com>2024-03-13 12:49:41 +0000
commitf04f86f3ee4f9eccfd72f473b8ff848161576a90 (patch)
tree16eb1a336506935b276e02d4d6b602ddcd17e69d
parent50033d03d31da5a1f7b5e8ffb8e03a969d88a3de (diff)
Revert "audiobasesink: Don't wait on gap events"
This reverts commit 8e923a8e2d7d9391554371045cfe4d0e2d8d0c7a. This caused regressions, see #3303. Without this commit, osxaudiosrc ! osxaudiosink won't work right, but since that hasn't really been a huge problem for years it's probably best to revert this until a proper solution can be figured out. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6356>
-rw-r--r--subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesink.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesink.c b/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesink.c
index 1f843acf44..891941d128 100644
--- a/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesink.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesink.c
@@ -1124,15 +1124,6 @@ gst_audio_base_sink_wait_event (GstBaseSink * bsink, GstEvent * event)
/* Make sure the ringbuffer will start again if interrupted during event_wait() */
g_atomic_int_set (&sink->eos_rendering, 1);
clear_force_start_flag = TRUE;
-
- /* For gap events, don't actually wait for the clock to
- * reach that time, or it will drain the ringbuffer, just
- * ensure we're prerolled and let the next actual buffer
- * get rendered where it belongs */
- if (GST_EVENT_TYPE (event) == GST_EVENT_GAP) {
- ret = gst_base_sink_do_preroll (bsink, GST_MINI_OBJECT_CAST (event));
- goto done;
- }
break;
default:
break;