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

mpegtsmux: Disable aggregator's default negotiation

Browse source 
mpegtsmux can't negotiate caps with upstream/downstream and always outputs
specific caps based on the input streams. This will always happen before
it produces the first buffers.

By having the default aggregator negotiation enabled the same caps
would be pushed twice in the beginning, and again every time a
reconfigure event is received.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2372>
This commit is contained in:
Sebastian Dröge 2022-05-05 20:35:49 +03:00 committed by GStreamer Marge Bot
parent 841cba4182
commit 52c419b799
1 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -263,15 +263,14 @@ gst_base_ts_mux_set_header_on_caps (GstBaseTsMux * mux)
GValue value = { 0 }; GValue value = { 0 };
GstCaps *caps; GstCaps *caps;
caps = gst_pad_get_current_caps (GST_AGGREGATOR_SRC_PAD (mux)); caps = gst_pad_get_pad_template_caps (GST_AGGREGATOR_SRC_PAD (mux));
/* If we have no caps, we are possibly shutting down */
if (!caps)
return;
caps = gst_caps_make_writable (caps); caps = gst_caps_make_writable (caps);
structure = gst_caps_get_structure (caps, 0); structure = gst_caps_get_structure (caps, 0);
gst_structure_set (structure, "packetsize", G_TYPE_INT, mux->packet_size,
NULL);
g_value_init (&array, GST_TYPE_ARRAY); g_value_init (&array, GST_TYPE_ARRAY);
GST_LOG_OBJECT (mux, "setting %u packets into streamheader", GST_LOG_OBJECT (mux, "setting %u packets into streamheader",
@ -2249,20 +2248,6 @@ beach:
return ret; return ret;
} }
static GstFlowReturn
gst_base_ts_mux_update_src_caps (GstAggregator * agg, GstCaps * caps,
GstCaps ** ret)
{
GstBaseTsMux *mux = GST_BASE_TS_MUX (agg);
GstStructure *s;
*ret = gst_caps_copy (caps);
s = gst_caps_get_structure (*ret, 0);
gst_structure_set (s, "packetsize", G_TYPE_INT, mux->packet_size, NULL);
return GST_FLOW_OK;
}
static GstBaseTsMuxPad * static GstBaseTsMuxPad *
gst_base_ts_mux_find_best_pad (GstAggregator * aggregator) gst_base_ts_mux_find_best_pad (GstAggregator * aggregator)
{ {
@ -2629,7 +2614,7 @@ gst_base_ts_mux_class_init (GstBaseTsMuxClass * klass)
gstelement_class->release_pad = gst_base_ts_mux_release_pad; gstelement_class->release_pad = gst_base_ts_mux_release_pad;
gstelement_class->send_event = gst_base_ts_mux_send_event; gstelement_class->send_event = gst_base_ts_mux_send_event;
gstagg_class->update_src_caps = gst_base_ts_mux_update_src_caps; gstagg_class->negotiate = NULL;
gstagg_class->aggregate = gst_base_ts_mux_aggregate; gstagg_class->aggregate = gst_base_ts_mux_aggregate;
gstagg_class->clip = gst_base_ts_mux_clip; gstagg_class->clip = gst_base_ts_mux_clip;
gstagg_class->sink_event = gst_base_ts_mux_sink_event; gstagg_class->sink_event = gst_base_ts_mux_sink_event;