mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

tsdemux: Refactor language tag extraction

Browse source 
subtitling descriptor needs to be used with a different method to extract
language codes.
This commit is contained in:
Edward Hervey 2013-10-11 10:29:20 +02:00
parent f36e0bca83
commit 5e50cd507c
1 changed files with 41 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
gst/mpegtsdemux/tsdemux.c
View file

@ -673,42 +673,64 @@ done:
return ret; return ret;
} }
static inline void
add_iso639_language_to_tags (TSDemuxStream * stream, gchar * lang_code)
{
const gchar *lc;
GST_LOG ("Add language code for stream: '%s'", lang_code);
if (!stream->taglist)
stream->taglist = gst_tag_list_new_empty ();
/* descriptor contains ISO 639-2 code, we want the ISO 639-1 code */
lc = gst_tag_get_language_code (lang_code);
/* Only set tag if we have a valid one */
if (lc || (lang_code[0] && lang_code[1]))
gst_tag_list_add (stream->taglist, GST_TAG_MERGE_REPLACE,
GST_TAG_LANGUAGE_CODE, (lc) ? lc : lang_code, NULL);
}
static void static void
gst_ts_demux_create_tags (TSDemuxStream * stream) gst_ts_demux_create_tags (TSDemuxStream * stream)
{ {
MpegTSBaseStream *bstream = (MpegTSBaseStream *) stream; MpegTSBaseStream *bstream = (MpegTSBaseStream *) stream;
const GstMpegTsDescriptor *desc = NULL; const GstMpegTsDescriptor *desc = NULL;
int i; int i, nb;
desc = desc =
mpegts_get_descriptor_from_stream (bstream, mpegts_get_descriptor_from_stream (bstream,
GST_MTS_DESC_ISO_639_LANGUAGE); GST_MTS_DESC_ISO_639_LANGUAGE);
if (desc) {
gchar lang_code[4];
if (!desc) { nb = gst_mpegts_descriptor_parse_iso_639_language_nb (desc);
desc =
mpegts_get_descriptor_from_stream (bstream, GST_DEBUG ("Found ISO 639 descriptor (%d entries)", nb);
GST_MTS_DESC_DVB_SUBTITLING);
for (i = 0; i < nb; i++)
if (gst_mpegts_descriptor_parse_iso_639_language_idx (desc, i, &lang_code,
NULL))
add_iso639_language_to_tags (stream, lang_code);
return;
} }
desc =
mpegts_get_descriptor_from_stream (bstream, GST_MTS_DESC_DVB_SUBTITLING);
if (desc) { if (desc) {
gchar lang_code[4]; gchar lang_code[4];
GstMpegTsIso639AudioType audio_type;
if (!stream->taglist) nb = gst_mpegts_descriptor_parse_dvb_subtitling_nb (desc);
stream->taglist = gst_tag_list_new_empty ();
for (i = 0; gst_mpegts_descriptor_parse_iso_639_language_idx (desc, GST_DEBUG ("Found SUBTITLING descriptor (%d entries)", nb);
i, &lang_code, &audio_type); i++) {
const gchar *lc; for (i = 0; i < nb; i++)
if (gst_mpegts_descriptor_parse_dvb_subtitling_idx (desc, i, &lang_code,
GST_LOG ("Add language code for stream: %s", lang_code); NULL, NULL, NULL))
add_iso639_language_to_tags (stream, lang_code);
/* descriptor contains ISO 639-2 code, we want the ISO 639-1 code */
lc = gst_tag_get_language_code (lang_code);
gst_tag_list_add (stream->taglist, GST_TAG_MERGE_REPLACE,
GST_TAG_LANGUAGE_CODE, (lc) ? lc : lang_code, NULL);
}
} }
} }