mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-11 09:06:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: Allow streams with no specified protection system ID

Browse source 
This is necessary in cases like CMAF where there won't be any events
passing thru.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/852>
This commit is contained in:
Xabier Rodriguez Calvar 2020-12-21 13:55:58 +01:00
parent 386b785e48
commit c5ebaadf9d
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gst/isomp4/qtdemux.c
View file

@ -8320,10 +8320,19 @@ gst_qtdemux_configure_protected_caps (GstQTDemux * qtdemux,
GST_FOURCC_ARGS (stream->protection_scheme_type));
return FALSE;
}
s = gst_caps_get_structure (CUR_STREAM (stream)->caps, 0);
if (!gst_structure_has_name (s, "application/x-cenc")) {
gst_structure_set (s,
"original-media-type", G_TYPE_STRING, gst_structure_get_name (s), NULL);
gst_structure_set_name (s, "application/x-cenc");
}
if (qtdemux->protection_system_ids == NULL) {
GST_ERROR_OBJECT (qtdemux, "stream is protected using cenc, but no "
"cenc protection system information has been found");
return FALSE;
GST_DEBUG_OBJECT (qtdemux, "stream is protected using cenc, but no "
"cenc protection system information has been found, not setting a "
"protection system UUID");
return TRUE;
}
gst_qtdemux_request_protection_context (qtdemux, stream);
@ -8360,14 +8369,10 @@ gst_qtdemux_configure_protected_caps (GstQTDemux * qtdemux,
GST_DEBUG_OBJECT (qtdemux, "selected protection system is %s",
selected_system);
s = gst_caps_get_structure (CUR_STREAM (stream)->caps, 0);
if (!gst_structure_has_name (s, "application/x-cenc")) {
gst_structure_set (s,
"original-media-type", G_TYPE_STRING, gst_structure_get_name (s),
GST_PROTECTION_SYSTEM_ID_CAPS_FIELD, G_TYPE_STRING, selected_system,
NULL);
gst_structure_set_name (s, "application/x-cenc");
}
gst_structure_set (s,
GST_PROTECTION_SYSTEM_ID_CAPS_FIELD, G_TYPE_STRING, selected_system,
NULL);
return TRUE;
}