mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 17:20:36 +00:00
dashdemux: corrected search for audio languages
Corrected the initialisation of mimeType in gst_mpdparser_get_list_and_nb_of_audio_language: the variable is used in a loop, so it must be set to NULL at the beginning of each iteration. https://bugzilla.gnome.org/show_bug.cgi?id=751911
This commit is contained in:
parent
cf59f3734c
commit
5151c42085
1 changed files with 5 additions and 6 deletions
|
@ -3538,7 +3538,7 @@ gst_mpd_client_setup_streaming (GstMpdClient * client,
|
||||||
|
|
||||||
GST_DEBUG ("0. Current stream %p", stream);
|
GST_DEBUG ("0. Current stream %p", stream);
|
||||||
|
|
||||||
/* retrive representation list */
|
/* retrieve representation list */
|
||||||
if (stream->cur_adapt_set != NULL)
|
if (stream->cur_adapt_set != NULL)
|
||||||
rep_list = stream->cur_adapt_set->Representations;
|
rep_list = stream->cur_adapt_set->Representations;
|
||||||
|
|
||||||
|
@ -4474,11 +4474,12 @@ gst_mpdparser_get_list_and_nb_of_audio_language (GstMpdClient * client,
|
||||||
for (list = g_list_first (stream_period->period->AdaptationSets); list;
|
for (list = g_list_first (stream_period->period->AdaptationSets); list;
|
||||||
list = g_list_next (list)) {
|
list = g_list_next (list)) {
|
||||||
adapt_set = (GstAdaptationSetNode *) list->data;
|
adapt_set = (GstAdaptationSetNode *) list->data;
|
||||||
if (adapt_set) {
|
if (adapt_set && adapt_set->lang) {
|
||||||
gchar *this_lang = adapt_set->lang;
|
gchar *this_lang = adapt_set->lang;
|
||||||
GstRepresentationNode *rep;
|
GstRepresentationNode *rep;
|
||||||
rep =
|
rep =
|
||||||
gst_mpdparser_get_lowest_representation (adapt_set->Representations);
|
gst_mpdparser_get_lowest_representation (adapt_set->Representations);
|
||||||
|
mimeType = NULL;
|
||||||
if (rep->RepresentationBase)
|
if (rep->RepresentationBase)
|
||||||
mimeType = rep->RepresentationBase->mimeType;
|
mimeType = rep->RepresentationBase->mimeType;
|
||||||
if (!mimeType && adapt_set->RepresentationBase) {
|
if (!mimeType && adapt_set->RepresentationBase) {
|
||||||
|
@ -4486,13 +4487,11 @@ gst_mpdparser_get_list_and_nb_of_audio_language (GstMpdClient * client,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strncmp_ext (mimeType, this_mimeType) == 0) {
|
if (strncmp_ext (mimeType, this_mimeType) == 0) {
|
||||||
if (this_lang) {
|
|
||||||
nb_adaptation_set++;
|
nb_adaptation_set++;
|
||||||
*lang = g_list_append (*lang, this_lang);
|
*lang = g_list_append (*lang, this_lang);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return nb_adaptation_set;
|
return nb_adaptation_set;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue