From: Xavier Claessens Date: Thu, 24 Oct 2019 19:27:42 +0000 (-0400) Subject: amc: Change plugin name if it's built for Magic Leap X-Git-Tag: 1.19.3~507^2~2694 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d31f7a9e553233670fa54a4a3a447735ee24887;p=platform%2Fupstream%2Fgstreamer.git amc: Change plugin name if it's built for Magic Leap --- diff --git a/sys/androidmedia/gstamc.c b/sys/androidmedia/gstamc.c index 9fbcc2b..8276046 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 61de4ce..20d5761 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],