8297362: EOS might not be delivered by progressbuffer in some cases

Reviewed-by: kcr, arapte

Author: Alexander Matveev

modules/javafx.media/src/main/native/gstreamer/plugins/progressbuffer/progressbuffer.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -174,6 +174,7 @@ static gpointer         progress_buffer_range_monitor(ProgressBuffer *element);
 #endif
 
 static void             progress_buffer_set_pending_event(ProgressBuffer *element, GstEvent* new_event);
+static GstEventType     progress_buffer_get_pending_event_type(ProgressBuffer *element);
 
 /**
  * progress_buffer_class_init()
@@ -513,6 +514,14 @@ static void progress_buffer_set_pending_event(ProgressBuffer *element, GstEvent*
     element->pending_src_event = new_event;
 }
 
+static GstEventType progress_buffer_get_pending_event_type(ProgressBuffer *element)
+{
+    if (element->pending_src_event)
+        return GST_EVENT_TYPE(element->pending_src_event);
+    else
+        return GST_EVENT_UNKNOWN;
+}
+
 /**
  * send_position_message
  * Sends application message on the BUS with the following parameters:
@@ -590,7 +599,11 @@ static GstFlowReturn progress_buffer_enqueue_item(ProgressBuffer *element, GstMi
                 if (element->sink_segment.position < element->sink_segment.stop)
                     element->sink_segment.stop = element->sink_segment.position;
 
-                progress_buffer_set_pending_event(element, NULL);
+                // Do not clear pending EOS event if set. If progress buffer
+                // set pending EOS event we need to deliver it, otherwise
+                // downstream will wait for data forever.
+                if (progress_buffer_get_pending_event_type(element) != GST_EVENT_EOS)
+                    progress_buffer_set_pending_event(element, NULL);
 
                 signal = send_position_message(element, TRUE);
                 gst_event_unref(event); // INLINE - gst_event_unref()

modules/javafx.media/src/main/native/xcode_project/JFXMedia.xcodeproj/project.pbxproj

@@ -116,6 +116,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		114ECB8E2928543700BE8CE2 /* plugins */ = {isa = PBXFileReference; lastKnownFileType = folder; name = plugins; path = ../gstreamer/plugins; sourceTree = "<group>"; };
 		652BECE8199BCFD4007217BB /* NullAudioEqualizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NullAudioEqualizer.h; sourceTree = "<group>"; };
 		652BECEB199BD515007217BB /* NullAudioSpectrum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NullAudioSpectrum.h; sourceTree = "<group>"; };
 		652BECED199BDB28007217BB /* NativeAudioEqualizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NativeAudioEqualizer.cpp; sourceTree = "<group>"; };
@@ -613,6 +614,7 @@
 		65FF278A1991545E006BF9EE = {
 			isa = PBXGroup;
 			children = (
+				114ECB8E2928543700BE8CE2 /* plugins */,
 				B3BFE7721D7A15FA00E48712 /* glib */,
 				B3BFE7711D7A159A00E48712 /* gstreamer-lite */,
 				65989B121991823700319296 /* build_prereqs.sh */,
@@ -712,6 +714,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -948,7 +951,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				GLIB_LITE_DIR = "../gstreamer/3rd_party/glib";
+				GLIB_LITE_DIR = ../gstreamer/3rd_party/glib;
 				GSTREAMER_LITE_DIR = "../gstreamer/gstreamer-lite";
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1000,7 +1003,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				GLIB_LITE_DIR = "../gstreamer/3rd_party/glib";
+				GLIB_LITE_DIR = ../gstreamer/3rd_party/glib;
 				GSTREAMER_LITE_DIR = "../gstreamer/gstreamer-lite";
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",