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

splitmuxsink: Warn when calculating the next fragment time in timecode mode fails

Browse source 
But only if timecode mode is enabled as it will fail all the time
otherwise.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1557>
This commit is contained in:
Sebastian Dröge 2022-01-24 10:45:33 +02:00 committed by GStreamer Marge Bot
parent 4f7e881fcc
commit 241a26631d
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
subprojects/gst-plugins-good/gst/multifile/gstsplitmuxsink.c
View file

@ -792,11 +792,13 @@ gst_splitmux_sink_set_property (GObject * object, guint prop_id,
splitmux->threshold_timecode_str = NULL; splitmux->threshold_timecode_str = NULL;
} }
} }
splitmux->next_fragment_start_tc_time = GST_CLOCK_TIME_NONE; splitmux->next_fragment_start_tc_time =
if (splitmux->tc_interval && splitmux->fragment_start_tc) { calculate_next_max_timecode (splitmux, splitmux->fragment_start_tc,
splitmux->next_fragment_start_tc_time = splitmux->fragment_start_time, NULL);
calculate_next_max_timecode (splitmux, splitmux->fragment_start_tc, if (splitmux->tc_interval && splitmux->fragment_start_tc
splitmux->fragment_start_time, NULL); && !GST_CLOCK_TIME_IS_VALID (splitmux->next_fragment_start_tc_time)) {
GST_WARNING_OBJECT (splitmux,
"Couldn't calculate next fragment start time for timecode mode");
} }
GST_OBJECT_UNLOCK (splitmux); GST_OBJECT_UNLOCK (splitmux);
break; break;
@ -1540,6 +1542,11 @@ request_next_keyframe (GstSplitMuxSink * splitmux, GstBuffer * buffer,
timecode_based = GST_CLOCK_TIME_IS_VALID (max_tc_time) && timecode_based = GST_CLOCK_TIME_IS_VALID (max_tc_time) &&
GST_CLOCK_TIME_IS_VALID (next_max_tc_time); GST_CLOCK_TIME_IS_VALID (next_max_tc_time);
if (!timecode_based) {
GST_WARNING_OBJECT (splitmux,
"Couldn't calculate maximum fragment time for timecode mode");
}
} else { } else {
/* This can happen in the presence of GAP events that trigger /* This can happen in the presence of GAP events that trigger
* a new fragment start */ * a new fragment start */
@ -2541,7 +2548,8 @@ handle_gathered_gop (GstSplitMuxSink * splitmux, const InputGop * gop,
splitmux->next_fragment_start_tc_time = splitmux->next_fragment_start_tc_time =
calculate_next_max_timecode (splitmux, splitmux->fragment_start_tc, calculate_next_max_timecode (splitmux, splitmux->fragment_start_tc,
splitmux->fragment_start_time, NULL); splitmux->fragment_start_time, NULL);
if (!GST_CLOCK_TIME_IS_VALID (splitmux->next_fragment_start_tc_time)) { if (splitmux->tc_interval && splitmux->fragment_start_tc
&& !GST_CLOCK_TIME_IS_VALID (splitmux->next_fragment_start_tc_time)) {
GST_WARNING_OBJECT (splitmux, GST_WARNING_OBJECT (splitmux,
"Couldn't calculate next fragment start time for timecode mode"); "Couldn't calculate next fragment start time for timecode mode");
} }
@ -2969,7 +2977,12 @@ handle_mq_input (GstPad * pad, GstPadProbeInfo * info, MqStreamCtx * ctx)
splitmux->next_fragment_start_tc_time = splitmux->next_fragment_start_tc_time =
calculate_next_max_timecode (splitmux, &tc_meta->tc, calculate_next_max_timecode (splitmux, &tc_meta->tc,
running_time, NULL); running_time, NULL);
if (splitmux->tc_interval
&& !GST_CLOCK_TIME_IS_VALID (splitmux->next_fragment_start_tc_time))
{
GST_WARNING_OBJECT (splitmux,
"Couldn't calculate next fragment start time for timecode mode");
}
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG
{ {
gchar *tc_str; gchar *tc_str;