mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtsmux: Respect the start-time-selection property.

Browse source 
Use the start time provided by the aggregator base class for output
times.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2105>
This commit is contained in:
Jan Schmidt 2021-03-25 03:16:05 +11:00 committed by GStreamer Marge Bot
parent 7740ab9b86
commit 3a3c80e7be
2 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gst/mpegtsmux/gstbasetsmux.c
View file

@ -328,6 +328,7 @@ gst_base_ts_mux_reset (GstBaseTsMux * mux, gboolean alloc)
if (mux->out_adapter) if (mux->out_adapter)
gst_adapter_clear (mux->out_adapter); gst_adapter_clear (mux->out_adapter);
mux->output_ts_offset = GST_CLOCK_TIME_NONE;
if (mux->tsmux) { if (mux->tsmux) {
if (mux->tsmux->si_sections) if (mux->tsmux->si_sections)
@ -1080,15 +1081,43 @@ static gboolean
new_packet_cb (GstBuffer * buf, void *user_data, gint64 new_pcr) new_packet_cb (GstBuffer * buf, void *user_data, gint64 new_pcr)
{ {
GstBaseTsMux *mux = (GstBaseTsMux *) user_data; GstBaseTsMux *mux = (GstBaseTsMux *) user_data;
GstAggregator *agg = GST_AGGREGATOR (mux);
GstBaseTsMuxClass *klass = GST_BASE_TS_MUX_GET_CLASS (mux); GstBaseTsMuxClass *klass = GST_BASE_TS_MUX_GET_CLASS (mux);
GstMapInfo map; GstMapInfo map;
GstSegment *agg_segment = &GST_AGGREGATOR_PAD (agg->srcpad)->segment;
g_assert (klass->output_packet); g_assert (klass->output_packet);
gst_buffer_map (buf, &map, GST_MAP_READWRITE); gst_buffer_map (buf, &map, GST_MAP_READWRITE);
if (!GST_CLOCK_TIME_IS_VALID (GST_BUFFER_PTS (buf))) if (!GST_CLOCK_TIME_IS_VALID (GST_BUFFER_PTS (buf))) {
/* tsmux isn't generating timestamps. Use the input times */
GST_BUFFER_PTS (buf) = mux->last_ts; GST_BUFFER_PTS (buf) = mux->last_ts;
}
if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_PTS (buf))) {
if (!GST_CLOCK_TIME_IS_VALID (mux->output_ts_offset)) {
GstClockTime output_start_time = agg_segment->position;
if (agg_segment->position == -1
|| agg_segment->position < agg_segment->start) {
output_start_time = agg_segment->start;
}
mux->output_ts_offset =
GST_CLOCK_DIFF (GST_BUFFER_PTS (buf), output_start_time);
GST_DEBUG_OBJECT (mux, "New output ts offset %" GST_STIME_FORMAT,
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;
}
}
if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_PTS (buf))) {
agg_segment->position = GST_BUFFER_PTS (buf);
}
/* do common init (flags and streamheaders) */ /* do common init (flags and streamheaders) */
new_packet_common_init (mux, buf, map.data, map.size); new_packet_common_init (mux, buf, map.data, map.size);

1
gst/mpegtsmux/gstbasetsmux.h
View file

@ -197,6 +197,7 @@ struct GstBaseTsMux {
/* output buffer aggregation */ /* output buffer aggregation */
GstAdapter *out_adapter; GstAdapter *out_adapter;
GstBuffer *out_buffer; GstBuffer *out_buffer;
GstClockTimeDiff output_ts_offset;
}; };
/** /**