mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 04:01:08 +00:00
watchdog: Handle FLUSHING seek events even in PAUSED state
https://bugzilla.gnome.org/show_bug.cgi?id=740757
This commit is contained in:
parent
eb24d9d607
commit
31679e56bb
2 changed files with 20 additions and 2 deletions
|
@ -211,7 +211,23 @@ static void
|
|||
gst_watchdog_feed (GstWatchdog * watchdog, gpointer mini_object, gboolean force)
|
||||
{
|
||||
if (watchdog->source) {
|
||||
if (watchdog->waiting_for_a_buffer) {
|
||||
if (watchdog->waiting_for_flush_start) {
|
||||
if (mini_object && GST_IS_EVENT (mini_object) &&
|
||||
GST_EVENT_TYPE (mini_object) == GST_EVENT_FLUSH_START) {
|
||||
watchdog->waiting_for_flush_start = FALSE;
|
||||
watchdog->waiting_for_flush_stop = TRUE;
|
||||
}
|
||||
|
||||
force = TRUE;
|
||||
} else if (watchdog->waiting_for_flush_stop) {
|
||||
if (mini_object && GST_IS_EVENT (mini_object) &&
|
||||
GST_EVENT_TYPE (mini_object) == GST_EVENT_FLUSH_STOP) {
|
||||
watchdog->waiting_for_flush_stop = FALSE;
|
||||
watchdog->waiting_for_a_buffer = TRUE;
|
||||
}
|
||||
|
||||
force = TRUE;
|
||||
} else if (watchdog->waiting_for_a_buffer) {
|
||||
if (mini_object && GST_IS_BUFFER (mini_object)) {
|
||||
watchdog->waiting_for_a_buffer = FALSE;
|
||||
GST_DEBUG_OBJECT (watchdog, "Got a buffer \\o/");
|
||||
|
@ -330,7 +346,7 @@ gst_watchdog_src_event (GstBaseTransform * trans, GstEvent * event)
|
|||
if (flags & GST_SEEK_FLAG_FLUSH) {
|
||||
force = TRUE;
|
||||
GST_DEBUG_OBJECT (watchdog, "Got a FLUSHING seek, we need a buffer now!");
|
||||
watchdog->waiting_for_a_buffer = TRUE;
|
||||
watchdog->waiting_for_flush_start = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -47,6 +47,8 @@ struct _GstWatchdog
|
|||
GSource *source;
|
||||
|
||||
gboolean waiting_for_a_buffer;
|
||||
gboolean waiting_for_flush_start;
|
||||
gboolean waiting_for_flush_stop;
|
||||
};
|
||||
|
||||
struct _GstWatchdogClass
|
||||
|
|
Loading…
Reference in a new issue