From 7d31f7a9e553233670fa54a4a3a447735ee24887 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 24 Oct 2019 15:27:42 -0400 Subject: [PATCH] amc: Change plugin name if it's built for Magic Leap --- sys/androidmedia/gstamc.c | 4 ++-- sys/androidmedia/meson.build | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/sys/androidmedia/gstamc.c b/sys/androidmedia/gstamc.c index 9fbcc2bd46..82760469e0 100644 --- a/sys/androidmedia/gstamc.c +++ b/sys/androidmedia/gstamc.c @@ -2410,7 +2410,7 @@ gst_amc_codec_info_to_caps (const GstAmcCodecInfo * codec_info, GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - androidmedia, - "Android Media plugin", + PLUGIN_NAME, + PLUGIN_DESCRIPTION, plugin_init, PACKAGE_VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/androidmedia/meson.build b/sys/androidmedia/meson.build index 61de4ce4cc..20d5761058 100644 --- a/sys/androidmedia/meson.build +++ b/sys/androidmedia/meson.build @@ -46,9 +46,18 @@ if have_mlsdk ] extra_deps = ml_deps have_jni_h = false + extra_cargs += [ + '-DPLUGIN_NAME=mlmedia', + '-DPLUGIN_DESCRIPTION="Magic Leap Media plugin"' + ] + plugin_name = 'gstmlmedia' else have_jni_h = cc.has_header('jni.h', required : amc_opt) - extra_cargs += '-DHAVE_JNI_H' + extra_cargs += [ + '-DHAVE_JNI_H', + '-DPLUGIN_NAME=androidmedia', + '-DPLUGIN_DESCRIPTION="Android Media plugin"' + ] androidmedia_sources += [ 'gstahcsrc.c', 'gstahssrc.c', @@ -62,10 +71,11 @@ else 'jni/gstamcsurface.c', 'jni/gstamcsurfacetexture-jni.c', ] + plugin_name = 'gstandroidmedia' endif if have_jni_h or have_mlsdk - gstandroidmedia = library('gstandroidmedia', + gstandroidmedia = library(plugin_name, androidmedia_sources, c_args : [gst_plugins_bad_args, extra_cargs], include_directories : [configinc],