WaterMark: create water mark plugin
GitLab: #13
Change-Id: Idab3d0b8fdfe6af2b481ac483a5b7ff423bec418
diff --git a/SDK/Templates/build.sh b/SDK/Templates/build.sh
index 2253327..5f47c01 100644
--- a/SDK/Templates/build.sh
+++ b/SDK/Templates/build.sh
@@ -100,12 +100,12 @@
if [ "$CURRENT_ABI" = armeabi-v7a ]
then
- export AR=$TOOLCHAIN/bin/arm-linux-android-ar
- export AS=$TOOLCHAIN/bin/arm-linux-android-as
+ export AR=$TOOLCHAIN/bin/arm-linux-androideabi-ar
+ export AS=$TOOLCHAIN/bin/arm-linux-androideabi-as
export CC=$TOOLCHAIN/bin/armv7a-linux-androideabi21-clang
export CXX=$TOOLCHAIN/bin/armv7a-linux-androideabi21-clang++
- export LD=$TOOLCHAIN/bin/arm-linux-android-ld
- export RANLIB=$TOOLCHAIN/bin/arm-linux-android-ranlib
+ export LD=$TOOLCHAIN/bin/arm-linux-androideabi-ld
+ export RANLIB=$TOOLCHAIN/bin/arm-linux-androideabi-ranlib
export STRIP=$TOOLCHAIN/bin/arm-linux-androideabi-strip
export ANDROID_SYSROOT=${DAEMON}/../client-android/android-toolchain-21-arm/sysroot
diff --git a/SDK/Templates/main.cpp b/SDK/Templates/main.cpp
index 21f64ea..abca25b 100644
--- a/SDK/Templates/main.cpp
+++ b/SDK/Templates/main.cpp
@@ -27,10 +27,10 @@
EXPORT_PLUGIN JAMI_PluginExitFunc
JAMI_dynPluginInit(const JAMI_PluginAPI* api)
{
- std::cout << "**************************" << std::endl << std::endl;
+ std::cout << "**************************" << std::endl;
std::cout << "** PLUGINNAME **" << std::endl;
std::cout << "**************************" << std::endl << std::endl;
- std::cout << " Version " << PLUGINNAME_VERSION_MAJOR << "." << PLUGINNAME_VERSION_MINOR << "."
+ std::cout << "Version " << PLUGINNAME_VERSION_MAJOR << "." << PLUGINNAME_VERSION_MINOR << "."
<< PLUGINNAME_VERSION_PATCH << std::endl;
// If invokeService doesn't return an error
diff --git a/SDK/Templates/preferences.json b/SDK/Templates/preferences.json
index b8ab719..c995694 100644
--- a/SDK/Templates/preferences.json
+++ b/SDK/Templates/preferences.json
@@ -35,6 +35,7 @@
"key": "keyName",
"title" : "preference title",
"summary" : "preference summary",
- "defaultValue" : "default value"
+ "defaultValue" : "default value",
+ "scope" : "plugin, Name of API implementation"
}
]
diff --git a/SDK/Templates/videoUpdate.txt b/SDK/Templates/videoUpdate.txt
index aff2307..e6f86f2 100644
--- a/SDK/Templates/videoUpdate.txt
+++ b/SDK/Templates/videoUpdate.txt
@@ -45,7 +45,6 @@
* sizeof(uint8_t));
}
- av_frame_copy_props(bgrFrame, pluginFrame);
moveFrom(pluginFrame, bgrFrame);
}
av_frame_unref(bgrFrame);