mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 20:51:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtsmux: Don't time out in live mode if no timestamped next buffer is available

Browse source 
The muxer can only advance the time if it has a timestamped buffer that can be
output, otherwise it will just busy-wait and use up a lot of CPU.

Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3912

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7870>
This commit is contained in:
Sebastian Dröge 2024-11-12 11:01:03 +02:00 committed by GStreamer Marge Bot
parent e0f0b5c829
commit 3971f8b86c
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
subprojects/gst-plugins-bad/gst/mpegtsmux/gstbasetsmux.c
View file

@ -2629,7 +2629,8 @@ beach:
} }
static GstBaseTsMuxPad * static GstBaseTsMuxPad *
gst_base_ts_mux_find_best_pad (GstAggregator * aggregator, gboolean timeout) gst_base_ts_mux_find_best_pad (GstAggregator * aggregator,
GstClockTime * best_time, gboolean timeout)
{ {
GstBaseTsMuxPad *best = NULL; GstBaseTsMuxPad *best = NULL;
GstClockTime best_ts = GST_CLOCK_TIME_NONE; GstClockTime best_ts = GST_CLOCK_TIME_NONE;
@ -2664,8 +2665,11 @@ gst_base_ts_mux_find_best_pad (GstAggregator * aggregator, gboolean timeout)
gst_buffer_unref (buffer); gst_buffer_unref (buffer);
} }
if (best) if (best) {
gst_object_ref (best); gst_object_ref (best);
if (best_time)
*best_time = best_ts;
}
GST_OBJECT_UNLOCK (aggregator); GST_OBJECT_UNLOCK (aggregator);
@ -2704,7 +2708,7 @@ gst_base_ts_mux_aggregate (GstAggregator * agg, gboolean timeout)
{ {
GstBaseTsMux *mux = GST_BASE_TS_MUX (agg); GstBaseTsMux *mux = GST_BASE_TS_MUX (agg);
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
GstBaseTsMuxPad *best = gst_base_ts_mux_find_best_pad (agg, timeout); GstBaseTsMuxPad *best = gst_base_ts_mux_find_best_pad (agg, NULL, timeout);
GstCaps *caps; GstCaps *caps;
/* set caps on the srcpad if no caps were set yet */ /* set caps on the srcpad if no caps were set yet */
@ -2778,6 +2782,21 @@ gst_base_ts_mux_stop (GstAggregator * agg)
return TRUE; return TRUE;
} }
static GstClockTime
gst_base_ts_mux_get_next_time (GstAggregator * agg)
{
GstBaseTsMuxPad *best = NULL;
GstClockTime next_time = GST_CLOCK_TIME_NONE;
best = gst_base_ts_mux_find_best_pad (agg, &next_time, TRUE);
// Buffer without timestamps are muxed immediately
if (best && next_time == GST_CLOCK_TIME_NONE)
next_time = 0;
gst_clear_object (&best);
return next_time;
}
/* GObject implementation */ /* GObject implementation */
static void static void
@ -3028,7 +3047,7 @@ gst_base_ts_mux_class_init (GstBaseTsMuxClass * klass)
gstagg_class->src_event = gst_base_ts_mux_src_event; gstagg_class->src_event = gst_base_ts_mux_src_event;
gstagg_class->start = gst_base_ts_mux_start; gstagg_class->start = gst_base_ts_mux_start;
gstagg_class->stop = gst_base_ts_mux_stop; gstagg_class->stop = gst_base_ts_mux_stop;
gstagg_class->get_next_time = gst_aggregator_simple_get_next_time; gstagg_class->get_next_time = gst_base_ts_mux_get_next_time;
klass->create_ts_mux = gst_base_ts_mux_default_create_ts_mux; klass->create_ts_mux = gst_base_ts_mux_default_create_ts_mux;
klass->allocate_packet = gst_base_ts_mux_default_allocate_packet; klass->allocate_packet = gst_base_ts_mux_default_allocate_packet;