From 4790a44d10273c5ebb87e5a41314a8aa8d6ffc4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 13 Mar 2024 12:49:41 +0000 Subject: [PATCH] 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. (cherry picked from commit f04f86f3ee4f9eccfd72f473b8ff848161576a90) (cherry picked from commit 93255efece907fdec28366aea6f474af051a1ed0) Part-of: --- .../gst-libs/gst/audio/gstaudiobasesink.c | 9 --------- 1 file changed, 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 bc0b7c881f..537425da1e 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;