From e5dbf86a548a5eb382dc8985c7536fc8ec7f55bf Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Mon, 7 Mar 2022 18:46:08 +0100 Subject: [PATCH] mpegtsmux: Use GST_CLOCK_STIME_NONE for output_ts_offset It's a GstClockTimeDiff, thus GST_CLOCK_TIME_NONE isn't appropriate. Part-of: --- subprojects/gst-plugins-bad/gst/mpegtsmux/gstbasetsmux.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/subprojects/gst-plugins-bad/gst/mpegtsmux/gstbasetsmux.c b/subprojects/gst-plugins-bad/gst/mpegtsmux/gstbasetsmux.c index ea1e528..56b22bb 100644 --- a/subprojects/gst-plugins-bad/gst/mpegtsmux/gstbasetsmux.c +++ b/subprojects/gst-plugins-bad/gst/mpegtsmux/gstbasetsmux.c @@ -320,7 +320,7 @@ gst_base_ts_mux_reset (GstBaseTsMux * mux, gboolean alloc) if (mux->out_adapter) gst_adapter_clear (mux->out_adapter); - mux->output_ts_offset = GST_CLOCK_TIME_NONE; + mux->output_ts_offset = GST_CLOCK_STIME_NONE; if (mux->tsmux) { if (mux->tsmux->si_sections) @@ -1133,7 +1133,7 @@ new_packet_cb (GstBuffer * buf, void *user_data, gint64 new_pcr) } if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_PTS (buf))) { - if (!GST_CLOCK_TIME_IS_VALID (mux->output_ts_offset)) { + if (!GST_CLOCK_STIME_IS_VALID (mux->output_ts_offset)) { GstClockTime output_start_time = agg_segment->position; if (agg_segment->position == -1 || agg_segment->position < agg_segment->start) { @@ -1147,9 +1147,7 @@ new_packet_cb (GstBuffer * buf, void *user_data, gint64 new_pcr) GST_STIME_ARGS (mux->output_ts_offset)); } - if (GST_CLOCK_TIME_IS_VALID (mux->output_ts_offset)) { - GST_BUFFER_PTS (buf) += mux->output_ts_offset; - } + GST_BUFFER_PTS (buf) += mux->output_ts_offset; } if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_PTS (buf))) { -- 2.7.4