mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 16:08:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

tsmux: Resend PMT whenever the language changes

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4711>
This commit is contained in:
Vivia Nikolaidou 2023-05-25 16:39:46 +03:00 committed by GStreamer Marge Bot
parent 06d793033d
commit 395e0c3925
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1953,6 +1953,21 @@ gst_base_ts_mux_send_event (GstElement * element, GstEvent * event)
return GST_ELEMENT_CLASS (parent_class)->send_event (element, event); return GST_ELEMENT_CLASS (parent_class)->send_event (element, event);
} }
/* Must be called with mux->lock held */
static void
gst_base_ts_mux_resend_all_pmts (GstBaseTsMux * mux)
{
GList *cur;
/* output PMT for each program */
for (cur = mux->tsmux->programs; cur; cur = cur->next) {
TsMuxProgram *program = (TsMuxProgram *) cur->data;
program->pmt_changed = TRUE;
tsmux_resend_pmt (program);
}
}
/* GstAggregator implementation */ /* GstAggregator implementation */
static gboolean static gboolean
@ -1970,7 +1985,6 @@ gst_base_ts_mux_sink_event (GstAggregator * agg, GstAggregatorPad * agg_pad,
{ {
GstCaps *caps; GstCaps *caps;
GstFlowReturn ret; GstFlowReturn ret;
GList *cur;
g_mutex_lock (&mux->lock); g_mutex_lock (&mux->lock);
if (ts_pad->stream == NULL) { if (ts_pad->stream == NULL) {
@ -1996,14 +2010,8 @@ gst_base_ts_mux_sink_event (GstAggregator * agg, GstAggregatorPad * agg_pad,
mux->tsmux->si_changed = TRUE; mux->tsmux->si_changed = TRUE;
tsmux_resend_pat (mux->tsmux); tsmux_resend_pat (mux->tsmux);
tsmux_resend_si (mux->tsmux); tsmux_resend_si (mux->tsmux);
gst_base_ts_mux_resend_all_pmts (mux);
/* output PMT for each program */
for (cur = mux->tsmux->programs; cur; cur = cur->next) {
TsMuxProgram *program = (TsMuxProgram *) cur->data;
program->pmt_changed = TRUE;
tsmux_resend_pmt (program);
}
g_mutex_unlock (&mux->lock); g_mutex_unlock (&mux->lock);
res = TRUE; res = TRUE;
@ -2096,10 +2104,19 @@ gst_base_ts_mux_sink_event (GstAggregator * agg, GstAggregatorPad * agg_pad,
lang_code = gst_tag_get_language_code_iso_639_2B (lang); lang_code = gst_tag_get_language_code_iso_639_2B (lang);
if (lang_code) { if (lang_code) {
gchar *old_language = g_strdup (ts_pad->language);
GST_DEBUG_OBJECT (ts_pad, "Setting language to '%s'", lang_code); GST_DEBUG_OBJECT (ts_pad, "Setting language to '%s'", lang_code);
g_free (ts_pad->language); g_free (ts_pad->language);
ts_pad->language = g_strdup (lang_code); ts_pad->language = g_strdup (lang_code);
strncpy (ts_pad->stream->language, lang_code, 3);
ts_pad->stream->language[3] = 0;
if (g_strcmp0 (old_language, lang_code) != 0) {
g_mutex_lock (&mux->lock);
gst_base_ts_mux_resend_all_pmts (mux);
g_mutex_unlock (&mux->lock);
}
g_free (old_language);
} else { } else {
GST_WARNING_OBJECT (ts_pad, "Did not get language code for '%s'", GST_WARNING_OBJECT (ts_pad, "Did not get language code for '%s'",
lang); lang);