mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 17:20:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegdemux: send language info downstream if available

Browse source 
... as extracted from dvd event.
This commit is contained in:
Mark Nauwelaerts 2012-10-12 22:33:27 +02:00
parent f708ab8de9
commit c24eb1db9b
2 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gst/mpegdemux/gstmpegdemux.c
View file

@ -307,6 +307,8 @@ gst_flups_demux_reset (GstFluPSDemux * demux)
if (stream->pad && GST_PAD_PARENT (stream->pad)) if (stream->pad && GST_PAD_PARENT (stream->pad))
gst_element_remove_pad (GST_ELEMENT_CAST (demux), stream->pad); gst_element_remove_pad (GST_ELEMENT_CAST (demux), stream->pad);
if (stream->pending_tags)
gst_tag_list_unref (stream->pending_tags);
g_free (stream); g_free (stream);
demux->streams[i] = NULL; demux->streams[i] = NULL;
} }
@ -453,6 +455,7 @@ gst_flups_demux_create_stream (GstFluPSDemux * demux, gint id, gint stream_type)
stream->notlinked = FALSE; stream->notlinked = FALSE;
stream->last_flow = GST_FLOW_OK; stream->last_flow = GST_FLOW_OK;
stream->type = stream_type; stream->type = stream_type;
stream->pending_tags = NULL;
stream->pad = gst_pad_new_from_template (template, name); stream->pad = gst_pad_new_from_template (template, name);
stream->segment_thresh = threshold; stream->segment_thresh = threshold;
gst_pad_set_event_function (stream->pad, gst_pad_set_event_function (stream->pad,
@ -553,6 +556,14 @@ gst_flups_demux_send_segment (GstFluPSDemux * demux, GstFluPSStream * stream,
stream->need_segment = FALSE; stream->need_segment = FALSE;
} }
if (G_UNLIKELY (stream->pending_tags)) {
GST_DEBUG_OBJECT (demux, "Sending pending_tags %p for pad %s:%s : %"
GST_PTR_FORMAT, stream->pending_tags,
GST_DEBUG_PAD_NAME (stream->pad), stream->pending_tags);
gst_pad_push_event (stream->pad, gst_event_new_tag (stream->pending_tags));
stream->pending_tags = NULL;
}
} }
static GstFlowReturn static GstFlowReturn
@ -685,7 +696,8 @@ gst_flups_demux_handle_dvd_event (GstFluPSDemux * demux, GstEvent * event)
const char *type = gst_structure_get_string (structure, "event"); const char *type = gst_structure_get_string (structure, "event");
gint i; gint i;
gchar cur_stream_name[32]; gchar cur_stream_name[32];
GstFluPSStream *temp G_GNUC_UNUSED; GstFluPSStream *temp;
const gchar *lang_code;
if (strcmp (type, "dvd-lang-codes") == 0) { if (strcmp (type, "dvd-lang-codes") == 0) {
GST_DEBUG_OBJECT (demux, "Handling language codes event"); GST_DEBUG_OBJECT (demux, "Handling language codes event");
@ -742,6 +754,16 @@ gst_flups_demux_handle_dvd_event (GstFluPSDemux * demux, GstEvent * event)
stream_format); stream_format);
break; break;
} }
g_snprintf (cur_stream_name, 32, "audio-%d-language", i);
lang_code = gst_structure_get_string (structure, cur_stream_name);
if (lang_code) {
GstTagList *list = gst_tag_list_new_empty ();
gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,
GST_TAG_LANGUAGE_CODE, lang_code, NULL);
temp->pending_tags = list;
}
} }
/* And subtitle streams */ /* And subtitle streams */
@ -764,6 +786,16 @@ gst_flups_demux_handle_dvd_event (GstFluPSDemux * demux, GstEvent * event)
/* Retrieve the subpicture stream to force pad creation */ /* Retrieve the subpicture stream to force pad creation */
temp = gst_flups_demux_get_stream (demux, 0x20 + stream_id, temp = gst_flups_demux_get_stream (demux, 0x20 + stream_id,
ST_PS_DVD_SUBPICTURE); ST_PS_DVD_SUBPICTURE);
g_snprintf (cur_stream_name, 32, "subpicture-%d-language", i);
lang_code = gst_structure_get_string (structure, cur_stream_name);
if (lang_code) {
GstTagList *list = gst_tag_list_new_empty ();
gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,
GST_TAG_LANGUAGE_CODE, lang_code, NULL);
temp->pending_tags = list;
}
} }
GST_DEBUG_OBJECT (demux, "Created all pads from Language Codes event, " GST_DEBUG_OBJECT (demux, "Created all pads from Language Codes event, "

2
gst/mpegdemux/gstmpegdemux.h
View file

@ -95,6 +95,8 @@ struct _GstFluPSStream
gboolean discont; gboolean discont;
gboolean notlinked; gboolean notlinked;
gboolean need_segment; gboolean need_segment;
GstTagList *pending_tags;
}; };
struct _GstFluPSDemux struct _GstFluPSDemux