mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtsdemux: fix language extraction

Browse source 
The descriptor contains ISO 639-2 language codes, but we want
two-letter ISO 639-1 codes in GST_TAG_LANGUAGE.
This commit is contained in:
Tim-Philipp Müller 2009-12-13 13:49:38 +00:00
parent 31ab47e03b
commit b32305d015
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/mpegdemux/Makefile.am
View file

@ -13,8 +13,12 @@ libgstmpegdemux_la_SOURCES = \
mpegtsparse.c \
mpegtspacketizer.c
libgstmpegdemux_la_CFLAGS = $(GST_CFLAGS) $(LIBOIL_CFLAGS)
libgstmpegdemux_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBOIL_LIBS)
libgstmpegdemux_la_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBOIL_CFLAGS)
libgstmpegdemux_la_LIBADD = \
$(GST_PLUGINS_BASE_CFLAGS) -lgsttag-$(GST_MAJORMINOR) \
$(GST_BASE_LIBS) $(GST_LIBS) $(LIBOIL_LIBS)
libgstmpegdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstmpegdemux_la_LIBTOOLFLAGS = --tag=disable-static

14
gst/mpegdemux/gstmpegtsdemux.c
View file

@ -50,6 +50,8 @@
#include <liboil/liboil.h>
#include <gst/tag/tag.h>
#include "gstmpegdefs.h"
#include "gstmpegtsdemux.h"
#include "flutspatinfo.h"
@ -949,17 +951,25 @@ gst_mpegts_demux_send_tags_for_stream (GstMpegTSDemux * demux,
gst_mpeg_descriptor_find (stream->ES_info, DESC_ISO_639_LANGUAGE);
if (iso639_languages) {
if (DESC_ISO_639_LANGUAGE_codes_n (iso639_languages)) {
const gchar *lc;
gchar lang_code[4];
gchar *language_n = (gchar *)
gchar *language_n;
language_n = (gchar *)
DESC_ISO_639_LANGUAGE_language_code_nth (iso639_languages, 0);
lang_code[0] = language_n[0];
lang_code[1] = language_n[1];
lang_code[2] = language_n[2];
lang_code[3] = 0;
if (!list)
list = gst_tag_list_new ();
/* 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 (list, GST_TAG_MERGE_REPLACE,
GST_TAG_LANGUAGE_CODE, lang_code, NULL);
GST_TAG_LANGUAGE_CODE, (lc) ? lc : lang_code, NULL);
}
}
}