eden-emu/opus
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove LPCNET_EXPORT

Browse source
This commit is contained in:
Jean-Marc Valin 2023-06-22 03:41:30 -04:00
parent 3c9ada30ef
commit abf60c33f7
No known key found for this signature in database
GPG key ID: 531A52533318F00A
4 changed files with 47 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dnn/lpcnet.c
View file

@ -166,12 +166,12 @@ int run_sample_network(LPCNetState *lpcnet, const float *gru_a_condition, const
return sample_mdense(&lpcnet->model.dual_fc, net->gru_b_state, sampling_logit_table, rng); return sample_mdense(&lpcnet->model.dual_fc, net->gru_b_state, sampling_logit_table, rng);
} }
LPCNET_EXPORT int lpcnet_get_size() int lpcnet_get_size()
{ {
return sizeof(LPCNetState); return sizeof(LPCNetState);
} }
LPCNET_EXPORT void lpcnet_reset(LPCNetState *lpcnet) void lpcnet_reset(LPCNetState *lpcnet)
{ {
const char* rng_string="LPCNet"; const char* rng_string="LPCNet";
RNN_CLEAR((char*)&lpcnet->LPCNET_RESET_START, RNN_CLEAR((char*)&lpcnet->LPCNET_RESET_START,
@ -181,7 +181,7 @@ LPCNET_EXPORT void lpcnet_reset(LPCNetState *lpcnet)
kiss99_srand(&lpcnet->rng, (const unsigned char *)rng_string, strlen(rng_string)); kiss99_srand(&lpcnet->rng, (const unsigned char *)rng_string, strlen(rng_string));
} }
LPCNET_EXPORT int lpcnet_init(LPCNetState *lpcnet) int lpcnet_init(LPCNetState *lpcnet)
{ {
int i; int i;
int ret; int ret;
@ -199,7 +199,7 @@ LPCNET_EXPORT int lpcnet_init(LPCNetState *lpcnet)
return ret; return ret;
} }
LPCNET_EXPORT int lpcnet_load_model(LPCNetState *st, const unsigned char *data, int len) { int lpcnet_load_model(LPCNetState *st, const unsigned char *data, int len) {
WeightArray *list; WeightArray *list;
int ret; int ret;
parse_weights(&list, data, len); parse_weights(&list, data, len);
@ -210,7 +210,7 @@ LPCNET_EXPORT int lpcnet_load_model(LPCNetState *st, const unsigned char *data,
} }
LPCNET_EXPORT LPCNetState *lpcnet_create() LPCNetState *lpcnet_create()
{ {
LPCNetState *lpcnet; LPCNetState *lpcnet;
lpcnet = (LPCNetState *)calloc(lpcnet_get_size(), 1); lpcnet = (LPCNetState *)calloc(lpcnet_get_size(), 1);
@ -218,7 +218,7 @@ LPCNET_EXPORT LPCNetState *lpcnet_create()
return lpcnet; return lpcnet;
} }
LPCNET_EXPORT void lpcnet_destroy(LPCNetState *lpcnet) void lpcnet_destroy(LPCNetState *lpcnet)
{ {
free(lpcnet); free(lpcnet);
} }
@ -276,6 +276,6 @@ void lpcnet_synthesize_impl(LPCNetState *lpcnet, const float *features, short *o
lpcnet_synthesize_tail_impl(lpcnet, output, N, preload); lpcnet_synthesize_tail_impl(lpcnet, output, N, preload);
} }
LPCNET_EXPORT void lpcnet_synthesize(LPCNetState *lpcnet, const float *features, short *output, int N) { void lpcnet_synthesize(LPCNetState *lpcnet, const float *features, short *output, int N) {
lpcnet_synthesize_impl(lpcnet, features, output, N, 0); lpcnet_synthesize_impl(lpcnet, features, output, N, 0);
} }

73
dnn/lpcnet.h
View file

@ -27,19 +27,6 @@
#ifndef _LPCNET_H_ #ifndef _LPCNET_H_
#define _LPCNET_H_ #define _LPCNET_H_
#ifndef LPCNET_EXPORT
# if defined(WIN32)
# if defined(LPCNET_BUILD) && defined(DLL_EXPORT)
# define LPCNET_EXPORT __declspec(dllexport)
# else
# define LPCNET_EXPORT
# endif
# elif defined(__GNUC__) && defined(LPCNET_BUILD)
# define LPCNET_EXPORT __attribute__ ((visibility ("default")))
# else
# define LPCNET_EXPORT
# endif
#endif
#define NB_FEATURES 20 #define NB_FEATURES 20
@ -64,7 +51,7 @@ typedef struct LPCNetPLCState LPCNetPLCState;
/** Gets the size of an <code>LPCNetDecState</code> structure. /** Gets the size of an <code>LPCNetDecState</code> structure.
* @returns The size in bytes. * @returns The size in bytes.
*/ */
LPCNET_EXPORT int lpcnet_decoder_get_size(void); int lpcnet_decoder_get_size(void);
/** Initializes a previously allocated decoder state /** Initializes a previously allocated decoder state
* The memory pointed to by st must be at least the size returned by lpcnet_decoder_get_size(). * The memory pointed to by st must be at least the size returned by lpcnet_decoder_get_size().
@ -73,19 +60,19 @@ LPCNET_EXPORT int lpcnet_decoder_get_size(void);
* @param [in] st <tt>LPCNetDecState*</tt>: Decoder state * @param [in] st <tt>LPCNetDecState*</tt>: Decoder state
* @retval 0 Success * @retval 0 Success
*/ */
LPCNET_EXPORT int lpcnet_decoder_init(LPCNetDecState *st); int lpcnet_decoder_init(LPCNetDecState *st);
LPCNET_EXPORT void lpcnet_reset(LPCNetState *lpcnet); void lpcnet_reset(LPCNetState *lpcnet);
/** Allocates and initializes a decoder state. /** Allocates and initializes a decoder state.
* @returns The newly created state * @returns The newly created state
*/ */
LPCNET_EXPORT LPCNetDecState *lpcnet_decoder_create(void); LPCNetDecState *lpcnet_decoder_create(void);
/** Frees an <code>LPCNetDecState</code> allocated by lpcnet_decoder_create(). /** Frees an <code>LPCNetDecState</code> allocated by lpcnet_decoder_create().
* @param[in] st <tt>LPCNetDecState*</tt>: State to be freed. * @param[in] st <tt>LPCNetDecState*</tt>: State to be freed.
*/ */
LPCNET_EXPORT void lpcnet_decoder_destroy(LPCNetDecState *st); void lpcnet_decoder_destroy(LPCNetDecState *st);
/** Decodes a packet of LPCNET_COMPRESSED_SIZE bytes (currently 8) into LPCNET_PACKET_SAMPLES samples (currently 640). /** Decodes a packet of LPCNET_COMPRESSED_SIZE bytes (currently 8) into LPCNET_PACKET_SAMPLES samples (currently 640).
* @param [in] st <tt>LPCNetDecState*</tt>: Decoder state * @param [in] st <tt>LPCNetDecState*</tt>: Decoder state
@ -93,14 +80,14 @@ LPCNET_EXPORT void lpcnet_decoder_destroy(LPCNetDecState *st);
* @param [out] pcm <tt>short *</tt>: Decoded audio * @param [out] pcm <tt>short *</tt>: Decoded audio
* @retval 0 Success * @retval 0 Success
*/ */
LPCNET_EXPORT int lpcnet_decode(LPCNetDecState *st, const unsigned char *buf, short *pcm); int lpcnet_decode(LPCNetDecState *st, const unsigned char *buf, short *pcm);
/** Gets the size of an <code>LPCNetEncState</code> structure. /** Gets the size of an <code>LPCNetEncState</code> structure.
* @returns The size in bytes. * @returns The size in bytes.
*/ */
LPCNET_EXPORT int lpcnet_encoder_get_size(void); int lpcnet_encoder_get_size(void);
/** Initializes a previously allocated encoder state /** Initializes a previously allocated encoder state
* The memory pointed to by st must be at least the size returned by lpcnet_encoder_get_size(). * The memory pointed to by st must be at least the size returned by lpcnet_encoder_get_size().
@ -109,17 +96,17 @@ LPCNET_EXPORT int lpcnet_encoder_get_size(void);
* @param [in] st <tt>LPCNetEncState*</tt>: Encoder state * @param [in] st <tt>LPCNetEncState*</tt>: Encoder state
* @retval 0 Success * @retval 0 Success
*/ */
LPCNET_EXPORT int lpcnet_encoder_init(LPCNetEncState *st); int lpcnet_encoder_init(LPCNetEncState *st);
/** Allocates and initializes an encoder state. /** Allocates and initializes an encoder state.
* @returns The newly created state * @returns The newly created state
*/ */
LPCNET_EXPORT LPCNetEncState *lpcnet_encoder_create(void); LPCNetEncState *lpcnet_encoder_create(void);
/** Frees an <code>LPCNetEncState</code> allocated by lpcnet_encoder_create(). /** Frees an <code>LPCNetEncState</code> allocated by lpcnet_encoder_create().
* @param[in] st <tt>LPCNetEncState*</tt>: State to be freed. * @param[in] st <tt>LPCNetEncState*</tt>: State to be freed.
*/ */
LPCNET_EXPORT void lpcnet_encoder_destroy(LPCNetEncState *st); void lpcnet_encoder_destroy(LPCNetEncState *st);
/** Encodes LPCNET_PACKET_SAMPLES speech samples (currently 640) into a packet of LPCNET_COMPRESSED_SIZE bytes (currently 8). /** Encodes LPCNET_PACKET_SAMPLES speech samples (currently 640) into a packet of LPCNET_COMPRESSED_SIZE bytes (currently 8).
* @param [in] st <tt>LPCNetDecState*</tt>: Encoder state * @param [in] st <tt>LPCNetDecState*</tt>: Encoder state
@ -127,7 +114,7 @@ LPCNET_EXPORT void lpcnet_encoder_destroy(LPCNetEncState *st);
* @param [out] buf <tt>const unsigned char *</tt>: Compressed packet * @param [out] buf <tt>const unsigned char *</tt>: Compressed packet
* @retval 0 Success * @retval 0 Success
*/ */
LPCNET_EXPORT int lpcnet_encode(LPCNetEncState *st, const short *pcm, unsigned char *buf); int lpcnet_encode(LPCNetEncState *st, const short *pcm, unsigned char *buf);
/** Compute features on LPCNET_PACKET_SAMPLES speech samples (currently 640) and output features for 4 10-ms frames at once. /** Compute features on LPCNET_PACKET_SAMPLES speech samples (currently 640) and output features for 4 10-ms frames at once.
* @param [in] st <tt>LPCNetDecState*</tt>: Encoder state * @param [in] st <tt>LPCNetDecState*</tt>: Encoder state
@ -135,7 +122,7 @@ LPCNET_EXPORT int lpcnet_encode(LPCNetEncState *st, const short *pcm, unsigned c
* @param [out] features <tt>float[4][NB_TOTAL_FEATURES]</tt>: Four feature vectors * @param [out] features <tt>float[4][NB_TOTAL_FEATURES]</tt>: Four feature vectors
* @retval 0 Success * @retval 0 Success
*/ */
LPCNET_EXPORT int lpcnet_compute_features(LPCNetEncState *st, const short *pcm, float features[4][NB_TOTAL_FEATURES]); int lpcnet_compute_features(LPCNetEncState *st, const short *pcm, float features[4][NB_TOTAL_FEATURES]);
/** Compute features on LPCNET_FRAME_SIZE speech samples (currently 160) and output features for one 10-ms frame. /** Compute features on LPCNET_FRAME_SIZE speech samples (currently 160) and output features for one 10-ms frame.
* @param [in] st <tt>LPCNetDecState*</tt>: Encoder state * @param [in] st <tt>LPCNetDecState*</tt>: Encoder state
@ -143,7 +130,7 @@ LPCNET_EXPORT int lpcnet_compute_features(LPCNetEncState *st, const short *pcm,
* @param [out] features <tt>float[NB_TOTAL_FEATURES]</tt>: Four feature vectors * @param [out] features <tt>float[NB_TOTAL_FEATURES]</tt>: Four feature vectors
* @retval 0 Success * @retval 0 Success
*/ */
LPCNET_EXPORT int lpcnet_compute_single_frame_features(LPCNetEncState *st, const short *pcm, float features[NB_TOTAL_FEATURES]); int lpcnet_compute_single_frame_features(LPCNetEncState *st, const short *pcm, float features[NB_TOTAL_FEATURES]);
/** Compute features on LPCNET_FRAME_SIZE speech samples (currently 160) and output features for one 10-ms frame. /** Compute features on LPCNET_FRAME_SIZE speech samples (currently 160) and output features for one 10-ms frame.
@ -152,12 +139,12 @@ LPCNET_EXPORT int lpcnet_compute_single_frame_features(LPCNetEncState *st, const
* @param [out] features <tt>float[NB_TOTAL_FEATURES]</tt>: Four feature vectors * @param [out] features <tt>float[NB_TOTAL_FEATURES]</tt>: Four feature vectors
* @retval 0 Success * @retval 0 Success
*/ */
LPCNET_EXPORT int lpcnet_compute_single_frame_features_float(LPCNetEncState *st, const float *pcm, float features[NB_TOTAL_FEATURES]); int lpcnet_compute_single_frame_features_float(LPCNetEncState *st, const float *pcm, float features[NB_TOTAL_FEATURES]);
/** Gets the size of an <code>LPCNetState</code> structure. /** Gets the size of an <code>LPCNetState</code> structure.
* @returns The size in bytes. * @returns The size in bytes.
*/ */
LPCNET_EXPORT int lpcnet_get_size(void); int lpcnet_get_size(void);
/** Initializes a previously allocated synthesis state /** Initializes a previously allocated synthesis state
* The memory pointed to by st must be at least the size returned by lpcnet_get_size(). * The memory pointed to by st must be at least the size returned by lpcnet_get_size().
@ -166,17 +153,17 @@ LPCNET_EXPORT int lpcnet_get_size(void);
* @param [in] st <tt>LPCNetState*</tt>: Synthesis state * @param [in] st <tt>LPCNetState*</tt>: Synthesis state
* @retval 0 Success * @retval 0 Success
*/ */
LPCNET_EXPORT int lpcnet_init(LPCNetState *st); int lpcnet_init(LPCNetState *st);
/** Allocates and initializes a synthesis state. /** Allocates and initializes a synthesis state.
* @returns The newly created state * @returns The newly created state
*/ */
LPCNET_EXPORT LPCNetState *lpcnet_create(void); LPCNetState *lpcnet_create(void);
/** Frees an <code>LPCNetState</code> allocated by lpcnet_create(). /** Frees an <code>LPCNetState</code> allocated by lpcnet_create().
* @param[in] st <tt>LPCNetState*</tt>: State to be freed. * @param[in] st <tt>LPCNetState*</tt>: State to be freed.
*/ */
LPCNET_EXPORT void lpcnet_destroy(LPCNetState *st); void lpcnet_destroy(LPCNetState *st);
/** Synthesizes speech from an LPCNet feature vector. /** Synthesizes speech from an LPCNet feature vector.
* @param [in] st <tt>LPCNetState*</tt>: Synthesis state * @param [in] st <tt>LPCNetState*</tt>: Synthesis state
@ -185,31 +172,31 @@ LPCNET_EXPORT void lpcnet_destroy(LPCNetState *st);
* @param [in] N <tt>int</tt>: Number of samples to generate * @param [in] N <tt>int</tt>: Number of samples to generate
* @retval 0 Success * @retval 0 Success
*/ */
LPCNET_EXPORT void lpcnet_synthesize(LPCNetState *st, const float *features, short *output, int N); void lpcnet_synthesize(LPCNetState *st, const float *features, short *output, int N);
#define LPCNET_PLC_CAUSAL 0 #define LPCNET_PLC_CAUSAL 0
#define LPCNET_PLC_CODEC 2 #define LPCNET_PLC_CODEC 2
LPCNET_EXPORT int lpcnet_plc_get_size(void); int lpcnet_plc_get_size(void);
LPCNET_EXPORT int lpcnet_plc_init(LPCNetPLCState *st, int options); int lpcnet_plc_init(LPCNetPLCState *st, int options);
LPCNET_EXPORT void lpcnet_plc_reset(LPCNetPLCState *st); void lpcnet_plc_reset(LPCNetPLCState *st);
LPCNET_EXPORT LPCNetPLCState *lpcnet_plc_create(int options); LPCNetPLCState *lpcnet_plc_create(int options);
LPCNET_EXPORT void lpcnet_plc_destroy(LPCNetPLCState *st); void lpcnet_plc_destroy(LPCNetPLCState *st);
LPCNET_EXPORT int lpcnet_plc_update(LPCNetPLCState *st, short *pcm); int lpcnet_plc_update(LPCNetPLCState *st, short *pcm);
LPCNET_EXPORT int lpcnet_plc_conceal(LPCNetPLCState *st, short *pcm); int lpcnet_plc_conceal(LPCNetPLCState *st, short *pcm);
LPCNET_EXPORT void lpcnet_plc_fec_add(LPCNetPLCState *st, const float *features); void lpcnet_plc_fec_add(LPCNetPLCState *st, const float *features);
LPCNET_EXPORT void lpcnet_plc_fec_clear(LPCNetPLCState *st); void lpcnet_plc_fec_clear(LPCNetPLCState *st);
LPCNET_EXPORT int lpcnet_load_model(LPCNetState *st, const unsigned char *data, int len); int lpcnet_load_model(LPCNetState *st, const unsigned char *data, int len);
LPCNET_EXPORT int lpcnet_plc_load_model(LPCNetPLCState *st, const unsigned char *data, int len); int lpcnet_plc_load_model(LPCNetPLCState *st, const unsigned char *data, int len);
#endif #endif

8
dnn/lpcnet_enc.c
View file

@ -45,24 +45,24 @@
#include "lpcnet.h" #include "lpcnet.h"
LPCNET_EXPORT int lpcnet_encoder_get_size() { int lpcnet_encoder_get_size() {
return sizeof(LPCNetEncState); return sizeof(LPCNetEncState);
} }
LPCNET_EXPORT int lpcnet_encoder_init(LPCNetEncState *st) { int lpcnet_encoder_init(LPCNetEncState *st) {
memset(st, 0, sizeof(*st)); memset(st, 0, sizeof(*st));
st->exc_mem = lin2ulaw(0.f); st->exc_mem = lin2ulaw(0.f);
return 0; return 0;
} }
LPCNET_EXPORT LPCNetEncState *lpcnet_encoder_create() { LPCNetEncState *lpcnet_encoder_create() {
LPCNetEncState *st; LPCNetEncState *st;
st = malloc(lpcnet_encoder_get_size()); st = malloc(lpcnet_encoder_get_size());
lpcnet_encoder_init(st); lpcnet_encoder_init(st);
return st; return st;
} }
LPCNET_EXPORT void lpcnet_encoder_destroy(LPCNetEncState *st) { void lpcnet_encoder_destroy(LPCNetEncState *st) {
free(st); free(st);
} }

12
dnn/lpcnet_plc.c
View file

@ -39,11 +39,11 @@
/* Comment this out to have LPCNet update its state on every good packet (slow). */ /* Comment this out to have LPCNet update its state on every good packet (slow). */
#define PLC_SKIP_UPDATES #define PLC_SKIP_UPDATES
LPCNET_EXPORT int lpcnet_plc_get_size() { int lpcnet_plc_get_size() {
return sizeof(LPCNetPLCState); return sizeof(LPCNetPLCState);
} }
LPCNET_EXPORT void lpcnet_plc_reset(LPCNetPLCState *st) { void lpcnet_plc_reset(LPCNetPLCState *st) {
RNN_CLEAR((char*)&st->LPCNET_PLC_RESET_START, RNN_CLEAR((char*)&st->LPCNET_PLC_RESET_START,
sizeof(LPCNetPLCState)- sizeof(LPCNetPLCState)-
((char*)&st->LPCNET_PLC_RESET_START - (char*)st)); ((char*)&st->LPCNET_PLC_RESET_START - (char*)st));
@ -56,7 +56,7 @@ LPCNET_EXPORT void lpcnet_plc_reset(LPCNetPLCState *st) {
st->loss_count = 0; st->loss_count = 0;
} }
LPCNET_EXPORT int lpcnet_plc_init(LPCNetPLCState *st, int options) { int lpcnet_plc_init(LPCNetPLCState *st, int options) {
int ret; int ret;
lpcnet_init(&st->lpcnet); lpcnet_init(&st->lpcnet);
lpcnet_encoder_init(&st->enc); lpcnet_encoder_init(&st->enc);
@ -77,7 +77,7 @@ LPCNET_EXPORT int lpcnet_plc_init(LPCNetPLCState *st, int options) {
return ret; return ret;
} }
LPCNET_EXPORT int lpcnet_plc_load_model(LPCNetPLCState *st, const unsigned char *data, int len) { int lpcnet_plc_load_model(LPCNetPLCState *st, const unsigned char *data, int len) {
WeightArray *list; WeightArray *list;
int ret; int ret;
parse_weights(&list, data, len); parse_weights(&list, data, len);
@ -89,14 +89,14 @@ LPCNET_EXPORT int lpcnet_plc_load_model(LPCNetPLCState *st, const unsigned char
else return -1; else return -1;
} }
LPCNET_EXPORT LPCNetPLCState *lpcnet_plc_create(int options) { LPCNetPLCState *lpcnet_plc_create(int options) {
LPCNetPLCState *st; LPCNetPLCState *st;
st = calloc(sizeof(*st), 1); st = calloc(sizeof(*st), 1);
lpcnet_plc_init(st, options); lpcnet_plc_init(st, options);
return st; return st;
} }
LPCNET_EXPORT void lpcnet_plc_destroy(LPCNetPLCState *st) { void lpcnet_plc_destroy(LPCNetPLCState *st) {
free(st); free(st);
} }