mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

splitmuxsink: Never start a new fragment with no reference buffers

Browse source 
If there has been no bytes from the reference stream muxed into
the current fragment, then time can't have advanced, there's no
GOP... this fragment would be broken or empty, so wait for some
data on the reference buffer.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/798>
This commit is contained in:
Jan Schmidt 2020-09-17 22:56:01 +10:00 committed by Jan Schmidt
parent 537e7d873a
commit 1316dd9c65
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst/multifile/gstsplitmuxsink.c
View file

@ -2186,8 +2186,10 @@ need_new_fragment (GstSplitMuxSink * splitmux,
&& splitmux->muxer_has_reserved_props; && splitmux->muxer_has_reserved_props;
GST_OBJECT_UNLOCK (splitmux); GST_OBJECT_UNLOCK (splitmux);
/* Have we muxed anything into the new file at all? */ /* Have we muxed at least one thing from the reference
if (splitmux->fragment_total_bytes <= 0) * stream into the file? If not, no other streams can have
* either */
if (splitmux->fragment_reference_bytes <= 0)
return FALSE; return FALSE;
/* User told us to split now */ /* User told us to split now */
@ -2361,6 +2363,7 @@ handle_gathered_gop (GstSplitMuxSink * splitmux)
new_out_ts = splitmux->reference_ctx->in_running_time; new_out_ts = splitmux->reference_ctx->in_running_time;
splitmux->fragment_start_time = splitmux->gop_start_time; splitmux->fragment_start_time = splitmux->gop_start_time;
splitmux->fragment_total_bytes = 0; splitmux->fragment_total_bytes = 0;
splitmux->fragment_reference_bytes = 0;
if (splitmux->tc_interval) { if (splitmux->tc_interval) {
video_time_code_replace (&splitmux->fragment_start_tc, video_time_code_replace (&splitmux->fragment_start_tc,
@ -2800,6 +2803,9 @@ handle_mq_input (GstPad * pad, GstPadProbeInfo * info, MqStreamCtx * ctx)
/* Update total input byte counter for overflow detect */ /* Update total input byte counter for overflow detect */
splitmux->gop_total_bytes += buf_info->buf_size; splitmux->gop_total_bytes += buf_info->buf_size;
if (ctx->is_reference) {
splitmux->fragment_reference_bytes += buf_info->buf_size;
}
/* Now add this buffer to the queue just before returning */ /* Now add this buffer to the queue just before returning */
g_queue_push_head (&ctx->queued_bufs, buf_info); g_queue_push_head (&ctx->queued_bufs, buf_info);
@ -3494,6 +3500,7 @@ gst_splitmux_sink_reset (GstSplitMuxSink * splitmux)
GST_CLOCK_STIME_NONE; GST_CLOCK_STIME_NONE;
splitmux->max_out_running_time = 0; splitmux->max_out_running_time = 0;
splitmux->fragment_total_bytes = 0; splitmux->fragment_total_bytes = 0;
splitmux->fragment_reference_bytes = 0;
splitmux->gop_total_bytes = 0; splitmux->gop_total_bytes = 0;
splitmux->muxed_out_bytes = 0; splitmux->muxed_out_bytes = 0;
splitmux->ready_for_output = FALSE; splitmux->ready_for_output = FALSE;

4
gst/multifile/gstsplitmuxsink.h
View file

@ -144,6 +144,10 @@ struct _GstSplitMuxSink
/* Number of bytes sent to the /* Number of bytes sent to the
* current fragment */ * current fragment */
guint64 fragment_total_bytes; guint64 fragment_total_bytes;
/* Number of bytes for the reference
* stream in this fragment */
guint64 fragment_reference_bytes;
/* Number of bytes we've collected into /* Number of bytes we've collected into
* the GOP that's being collected */ * the GOP that's being collected */
guint64 gop_total_bytes; guint64 gop_total_bytes;