Merge "secmem: support sideband and AV1 [1/1]" into buildroot-gstdrmplugin1.x
diff --git a/gst-aml-drm-plugins-1.0/src/dummy/gstdummydrm.c b/gst-aml-drm-plugins-1.0/src/dummy/gstdummydrm.c
index 9b520e9..629c88a 100644
--- a/gst-aml-drm-plugins-1.0/src/dummy/gstdummydrm.c
+++ b/gst-aml-drm-plugins-1.0/src/dummy/gstdummydrm.c
@@ -204,6 +204,7 @@
*outbuf = gst_buffer_new_allocate(plugin->allocator, gst_buffer_get_size(inbuf), NULL);
g_return_val_if_fail(*outbuf != NULL, GST_FLOW_ERROR);
+ GST_BASE_TRANSFORM_CLASS(parent_class)->copy_metadata (trans, inbuf, *outbuf);
return ret;
}
diff --git a/gst-aml-drm-plugins-1.0/src/secmem/gstsecmemallocator.c b/gst-aml-drm-plugins-1.0/src/secmem/gstsecmemallocator.c
index 94715a2..d00242f 100644
--- a/gst-aml-drm-plugins-1.0/src/secmem/gstsecmemallocator.c
+++ b/gst-aml-drm-plugins-1.0/src/secmem/gstsecmemallocator.c
@@ -229,8 +229,7 @@
gboolean
gst_is_secmem_memory (GstMemory *mem)
{
- g_return_val_if_fail(mem != NULL, FALSE);
- return GST_IS_SECMEM_ALLOCATOR(mem->allocator);
+ return gst_memory_is_type(mem, GST_ALLOCATOR_SECMEM);
}
gboolean
diff --git a/gst-aml-drm-plugins-1.0/src/secure_parse/Makefile.am b/gst-aml-drm-plugins-1.0/src/secure_parse/Makefile.am
index 70f60f4..2b4abd8 100644
--- a/gst-aml-drm-plugins-1.0/src/secure_parse/Makefile.am
+++ b/gst-aml-drm-plugins-1.0/src/secure_parse/Makefile.am
@@ -17,8 +17,15 @@
libgstamlsecparse_la_SOURCES = gst_aml_sec_parse.c gsth264_sec_parse.c gstvp9_sec_trans.c
# compiler and linker flags used to compile this plugin, set in configure.ac
-libgstamlsecparse_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/src/secmem -DGST_USE_UNSTABLE_API
-libgstamlsecparse_la_LIBADD = $(GST_LIBS) $(top_builddir)/src/secmem/libgstsecmemallocator.la -L$(TARGET_DIR)/usr/lib/gstreamer-1.0 -lgstvideoparsersbad
+libgstamlsecparse_la_CFLAGS = \
+ $(GST_BASE_CFLAGS) $(GST_CFLAGS)\
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/src/secmem \
+ -DGST_USE_UNSTABLE_API
+libgstamlsecparse_la_LIBADD = \
+ $(GST_LIBS) \
+ $(top_builddir)/src/secmem/libgstsecmemallocator.la \
+ $(GST_PLUGINS_BASE_LIBS) -lgstcodecparsers-1.0 -lgstpbutils-1.0
libgstamlsecparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstamlsecparse_la_LIBTOOLFLAGS = --tag=disable-static