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

mpdparser: wrap unmodified data in protection event

Browse source 
PlayReady being the one of the few DRM formats encoding its data with
base64 it was not consistent to have a special case for this. So the
base64 decoding operation now needs to be done by the protection event
consumer, if needed.

https://bugzilla.gnome.org/show_bug.cgi?id=774112
This commit is contained in:
Philippe Normand 2016-11-14 11:08:24 +01:00
parent b35979c31a
commit 0fbd2edaff
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ext/dash/gstmpdparser.c
View file

@ -1743,7 +1743,6 @@ gst_mpdparser_parse_content_protection_node (GList ** list, xmlNode * a_node)
for (cur_node = a_node->children; cur_node; cur_node = cur_node->next) {
if (cur_node->type == XML_ELEMENT_NODE) {
if (xmlStrcmp (cur_node->name, (xmlChar *) "pro") == 0) {
gsize decoded_len;
GstDescriptorType *new_descriptor;
new_descriptor = g_slice_new0 (GstDescriptorType);
*list = g_list_append (*list, new_descriptor);
@ -1753,8 +1752,6 @@ gst_mpdparser_parse_content_protection_node (GList ** list, xmlNode * a_node)
gst_mpdparser_get_xml_node_content (cur_node,
&new_descriptor->value);
g_base64_decode_inplace (new_descriptor->value, &decoded_len);
*(new_descriptor->value + decoded_len) = '\0';
goto beach;
}
}

2
tests/check/elements/dash_demux.c
View file

@ -1382,7 +1382,7 @@ testContentProtectionDashdemuxSendsEvent (GstAdaptiveDemuxTestEngine * engine,
fail_if (str == NULL);
} else if (g_strcmp0 (system_id, "9a04f079-9840-4286-ab92-e65be0885f95") == 0) {
fail_unless (g_strcmp0 (origin, "dash/mpd") == 0);
fail_unless (g_strcmp0 (value, "test") == 0);
fail_unless (g_strcmp0 (value, "dGVzdA==") == 0);
} else {
fail ("unexpected content protection event '%s'", system_id);
}