From: Seungbae Shin <seungbae.shin@samsung.com>
Date: Thu, 27 Jul 2023 04:24:52 +0000 (+0900)
Subject: Add extern "C" for the exported header and plugin entry point function
X-Git-Tag: accepted/tizen/unified/20230731.175315^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e114a3a64ca1aa854273114cad2741a78d2a3e86;p=platform%2Fcore%2Fmultimedia%2Flibaudio-effect.git

Add extern "C" for the exported header and plugin entry point function

[Version] 0.0.11
[Issue Type] Cleanup

Change-Id: I82bdba7adbb6c1510352427327756eb3e2e8b85d
---

diff --git a/include/audio_effect.h b/include/audio_effect.h
index 599160c..b89c130 100644
--- a/include/audio_effect.h
+++ b/include/audio_effect.h
@@ -17,6 +17,10 @@
 #ifndef __AUDIO_EFFECT_H__
 #define __AUDIO_EFFECT_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stddef.h>
 
 typedef struct audio_effect_interface audio_effect_interface_s;
@@ -57,4 +61,8 @@ int audio_effect_process_reference(audio_effect_s *ae, void *in, void *ref, void
 void audio_effect_destroy(audio_effect_s *ae);
 size_t audio_effect_get_process_framesize(audio_effect_s *ae);
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif // __AUDIO_EFFECT_H__
diff --git a/include/audio_effect_interface.h b/include/audio_effect_interface.h
index 7ea12ed..ff1407c 100644
--- a/include/audio_effect_interface.h
+++ b/include/audio_effect_interface.h
@@ -17,6 +17,10 @@
 #ifndef __AUDIO_EFFECT_INTERFACE_H__
 #define __AUDIO_EFFECT_INTERFACE_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "audio_effect.h"
 
 typedef void *(*dl_create_t)(int, int, audio_effect_format_e, size_t);
@@ -56,11 +60,15 @@ void audio_effect_interface_free(audio_effect_interface_s *intf);
 
 #define PLUGIN_ENTRY_POINT __audio_effect_plugin_entry_point__
 #define PLUGIN_ENTRY_POINT_DEFINE_FUNC(s) \
-    audio_effect_plugin_info_s *PLUGIN_ENTRY_POINT(void) { return &s; } \
+	audio_effect_plugin_info_s *PLUGIN_ENTRY_POINT(void) { return &s; }
 
 #define PLUGIN_CONVERT_TO_STRING(X) #X
 #define PLUGIN_ENTRY_POINT_CONVERT(X) PLUGIN_CONVERT_TO_STRING(X)
 #define PLUGIN_ENTRY_POINT_STRING PLUGIN_ENTRY_POINT_CONVERT(PLUGIN_ENTRY_POINT)
 
+#ifdef __cplusplus
+}
 #endif
 
+#endif // __AUDIO_EFFECT_INTERFACE_H__
+
diff --git a/include/audio_effect_log.h b/include/audio_effect_log.h
index 18ad723..3936f10 100644
--- a/include/audio_effect_log.h
+++ b/include/audio_effect_log.h
@@ -17,6 +17,10 @@
 #ifndef __AUDIO_EFFECT_LOG_H__
 #define __AUDIO_EFFECT_LOG_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef USE_DLOG
 #include <dlog.h>
 #ifdef LOG_TAG
@@ -37,4 +41,8 @@
 #define LOG_VERBOSE(...)	{ printf(__VA_ARGS__); printf("\n"); }
 #endif
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif // __AUDIO_EFFECT_LOG_H__
diff --git a/include/audio_effect_util.h b/include/audio_effect_util.h
index 9286068..cf0f067 100644
--- a/include/audio_effect_util.h
+++ b/include/audio_effect_util.h
@@ -17,6 +17,10 @@
 #ifndef __AUDIO_EFFECT_UTIL_H__
 #define __AUDIO_EFFECT_UTIL_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <audio_effect.h>
 
 size_t audio_effect_util_get_sample_size(audio_effect_format_e format);
@@ -30,4 +34,8 @@ void audio_effect_util_convert_float_to_s16le(size_t n, const float *a, short *b
 void audio_effect_util_interleave(const void **src, void *dst, int channels, size_t sample_size, size_t frames);
 void audio_effect_util_deinterleave(const void *src, void **dst, int channels, size_t sample_size, size_t frames);
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif // __AUDIO_EFFECT_UTIL_H__
diff --git a/packaging/libaudio-effect.spec b/packaging/libaudio-effect.spec
index 2beb14d..ec9e63a 100644
--- a/packaging/libaudio-effect.spec
+++ b/packaging/libaudio-effect.spec
@@ -1,6 +1,6 @@
 Name:       libaudio-effect
 Summary:    audio effect library
-Version:    0.0.10
+Version:    0.0.11
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
diff --git a/src/plugin_aec_webrtc.cpp b/src/plugin_aec_webrtc.cpp
index 14a37f1..86605ac 100644
--- a/src/plugin_aec_webrtc.cpp
+++ b/src/plugin_aec_webrtc.cpp
@@ -20,14 +20,10 @@
 #include <assert.h>
 #include <webrtc/modules/audio_processing/include/audio_processing.h>
 
-extern "C" {
 #include <audio_effect_interface.h>
 #include <audio_effect_util.h>
 #include <audio_effect_log.h>
 
-audio_effect_plugin_info_s *__audio_effect_plugin_entry_point__(void);
-}
-
 #define FIXED_FRAME_SIZE_MSEC 10
 #define CHANNELS_MAX 2
 
@@ -254,5 +250,4 @@ static audio_effect_plugin_info_s aec_webrtc_desc = {
 	},
 };
 
-PLUGIN_ENTRY_POINT_DEFINE_FUNC(aec_webrtc_desc);
-
+extern "C" PLUGIN_ENTRY_POINT_DEFINE_FUNC(aec_webrtc_desc);
diff --git a/src/plugin_agc_speex.c b/src/plugin_agc_speex.c
index 72a85b3..2c4f02b 100644
--- a/src/plugin_agc_speex.c
+++ b/src/plugin_agc_speex.c
@@ -102,4 +102,3 @@ static audio_effect_plugin_info_s agc_speex_desc = {
 };
 
 PLUGIN_ENTRY_POINT_DEFINE_FUNC(agc_speex_desc);
-
diff --git a/src/plugin_amplify.c b/src/plugin_amplify.c
index fd45330..3f8490a 100644
--- a/src/plugin_amplify.c
+++ b/src/plugin_amplify.c
@@ -86,4 +86,3 @@ static audio_effect_plugin_info_s amplify_desc = {
 };
 
 PLUGIN_ENTRY_POINT_DEFINE_FUNC(amplify_desc);
-
diff --git a/src/plugin_ns_rnnoise.c b/src/plugin_ns_rnnoise.c
index 2d8b47b..9de572d 100644
--- a/src/plugin_ns_rnnoise.c
+++ b/src/plugin_ns_rnnoise.c
@@ -34,8 +34,6 @@ struct userdata {
 	float *buffer;
 };
 
-static audio_effect_plugin_info_s ns_rnnoise_desc;
-
 static void *ns_rnnoise_create(int rate, int channels, audio_effect_format_e format, size_t frames)
 {
 	struct userdata *u;
@@ -122,4 +120,3 @@ static audio_effect_plugin_info_s ns_rnnoise_desc = {
 };
 
 PLUGIN_ENTRY_POINT_DEFINE_FUNC(ns_rnnoise_desc);
-
diff --git a/src/plugin_ns_srid.c b/src/plugin_ns_srid.c
index b298b58..3c45f13 100644
--- a/src/plugin_ns_srid.c
+++ b/src/plugin_ns_srid.c
@@ -57,6 +57,7 @@ static void *ns_srid_create(int rate, int channels, audio_effect_format_e format
 	/* framesize could be 960 in case of 48K (16K 320) */
 	u->frames = (size_t)frame_size;
 	u->buffer = (float *)malloc(sizeof(float) * u->frames);
+
 	ns_srid_desc.constraint.frames = u->frames;
 
 	noise_suppression_set_level(u->handle, NOISE_SUPPRESSION_LEVEL_MID);
@@ -128,4 +129,3 @@ static audio_effect_plugin_info_s ns_srid_desc = {
 };
 
 PLUGIN_ENTRY_POINT_DEFINE_FUNC(ns_srid_desc);
-
diff --git a/src/plugin_refcopy.c b/src/plugin_refcopy.c
index cba495c..5e57871 100644
--- a/src/plugin_refcopy.c
+++ b/src/plugin_refcopy.c
@@ -96,4 +96,3 @@ static audio_effect_plugin_info_s reference_copy_desc = {
 };
 
 PLUGIN_ENTRY_POINT_DEFINE_FUNC(reference_copy_desc);
-