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

gstprotection: Add missing namespace to macro

Browse source 
GST_PROTECTION_SYSTEM_ID_CAPS_FIELD was missing the GST_ namespace.
Add it before its too late.
This commit is contained in:
Nicolas Dufresne 2015-06-13 12:25:19 -04:00
parent 0e8a318dd7
commit a65cea7c69
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst/gstprotection.c
View file

@ -187,10 +187,10 @@ gst_protection_factory_check (GstElementFactory * fact,
GstStructure *st;
st = gst_caps_get_structure (caps, i);
if (gst_structure_has_field_typed (st, PROTECTION_SYSTEM_ID_CAPS_FIELD,
G_TYPE_STRING)) {
if (gst_structure_has_field_typed (st,
GST_PROTECTION_SYSTEM_ID_CAPS_FIELD, G_TYPE_STRING)) {
const gchar *sys_id =
gst_structure_get_string (st, PROTECTION_SYSTEM_ID_CAPS_FIELD);
gst_structure_get_string (st, GST_PROTECTION_SYSTEM_ID_CAPS_FIELD);
GST_DEBUG ("Found decryptor that supports protection system %s",
sys_id);
for (guint j = 0; !retval && system_identifiers[j]; ++j) {

11
gst/gstprotection.h
View file

@ -24,10 +24,15 @@
G_BEGIN_DECLS
/* @PROTECTION_SYSTEM_ID_CAPS_FIELD: The field name in a GstCaps that is
* used to signal the UUID of the protection system
/**
* GST_PROTECTION_SYSTEM_ID_CAPS_FIELD:
*
* The field name in a GstCaps that is used to signal the UUID of the protection
* system.
*
* Since 1.6
*/
#define PROTECTION_SYSTEM_ID_CAPS_FIELD "protection-system"
#define GST_PROTECTION_SYSTEM_ID_CAPS_FIELD "protection-system"
typedef struct _GstProtectionMeta GstProtectionMeta;
/**

2
tests/check/gst/gstprotection.c
View file

@ -68,7 +68,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_ALWAYS,
GST_STATIC_CAPS
("application/x-cenc, original-media-type=(string)video/x-h264, "
PROTECTION_SYSTEM_ID_CAPS_FIELD "=(string)" CLEARKEY_SYSTEM_ID)
GST_PROTECTION_SYSTEM_ID_CAPS_FIELD "=(string)" CLEARKEY_SYSTEM_ID)
);
static void