Squashed 'libjamesdsp/subtree/' changes from 06e6dfd..4f4d8cf

4f4d8cf fix: cherry-pick again
ca34f96 fix: accidental cherry-pick
49c8a53 Cherry-pick new features except libsamplerate update
b09a387 Revert "Introduce new features"

git-subtree-dir: libjamesdsp/subtree
git-subtree-split: 4f4d8cf8f3728a112ff24663186d75938ae5c181

Author: timschneeb

Main/libjamesdsp/jni/jamesdsp/jdsp/Effects/eel2/loose_eel.c

@@ -1,59 +1,18 @@
 /*
-** Copyright (c) 2002-2021, Erik de Castro Lopo <[email protected]>
+** Copyright (c) 2002-2016, Erik de Castro Lopo <[email protected]>
 ** All rights reserved.
 **
 ** This code is released under 2-clause BSD license. Please see the
-** file at : https://github.com/libsndfile/libsamplerate/blob/master/COPYING
+** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING
 */
 
 #ifndef COMMON_H_INCLUDED
 #define COMMON_H_INCLUDED
 
 #include <stdint.h>
-#ifdef HAVE_STDBOOL_H
-#include <stdbool.h>
-#endif
-
-#if defined(__x86_64__) || defined(_M_X64)
-#   define HAVE_SSE2_INTRINSICS
-#elif defined(ENABLE_SSE2_LRINT) && (defined(_M_IX86) || defined(__i386__))
-#   if defined(_MSC_VER)
-#       define HAVE_SSE2_INTRINSICS
-#   elif defined(__clang__)
-#       ifdef __SSE2__
-#           define HAVE_SSE2_INTRINSICS
-#       elif (__has_attribute(target))
-#           define HAVE_SSE2_INTRINSICS
-#           define USE_TARGET_ATTRIBUTE
-#       endif
-#   elif defined(__GNUC__)
-#       ifdef __SSE2__
-#           define HAVE_SSE2_INTRINSICS
-#       elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9))
-#           define HAVE_SSE2_INTRINSICS
-#           define USE_TARGET_ATTRIBUTE
-#       endif
-#   endif
-#endif
-
-#ifdef HAVE_SSE2_INTRINSICS
-#ifdef HAVE_IMMINTRIN_H
-#include <immintrin.h>
-#else
-#include <emmintrin.h>
-#endif
-#endif /* HAVE_SSE2_INTRINSICS */
 
 #include <math.h>
 
-#ifdef HAVE_VISIBILITY
-  #define LIBSAMPLERATE_DLL_PRIVATE __attribute__ ((visibility ("hidden")))
-#elif defined (__APPLE__)
-  #define LIBSAMPLERATE_DLL_PRIVATE __private_extern__
-#else
-  #define LIBSAMPLERATE_DLL_PRIVATE
-#endif
-
 #define	SRC_MAX_RATIO			256
 #define	SRC_MAX_RATIO_STR		"256"
 
@@ -71,6 +30,15 @@
 
 #define	MAKE_MAGIC(a,b,c,d,e,f)	((a) + ((b) << 4) + ((c) << 8) + ((d) << 12) + ((e) << 16) + ((f) << 20))
 
+/*
+** Adds casting needed if compiled/included within cpp
+*/
+#ifdef __cplusplus
+#define ZERO_ALLOC(type, size)	static_cast<type*>(calloc(1, size))
+#else // __cplusplus
+#define ZERO_ALLOC(type, size)	calloc(1, size)
+#endif
+
 /*
 ** Inspiration : http://sourcefrog.net/weblog/software/languages/C/unused.html
 */
@@ -94,17 +62,13 @@
 enum
 {	SRC_FALSE	= 0,
 	SRC_TRUE	= 1,
-} ;
 
-enum SRC_MODE
-{
-	SRC_MODE_PROCESS	= 0,
-	SRC_MODE_CALLBACK	= 1
+	SRC_MODE_PROCESS	= 555,
+	SRC_MODE_CALLBACK	= 556
 } ;
 
-typedef enum SRC_ERROR
-{
-	SRC_ERR_NO_ERROR = 0,
+enum
+{	SRC_ERR_NO_ERROR = 0,
 
 	SRC_ERR_MALLOC_FAILED,
 	SRC_ERR_BAD_STATE,
@@ -131,95 +95,40 @@ typedef enum SRC_ERROR
 
 	/* This must be the last error number. */
 	SRC_ERR_MAX_ERROR
-} SRC_ERROR ;
+} ;
 
-typedef struct SRC_STATE_VT_tag
-{
-	/* Varispeed process function. */
-	SRC_ERROR		(*vari_process) (SRC_STATE *state, SRC_DATA *data) ;
+typedef struct SRC_PRIVATE_tag
+{	double	last_ratio, last_position ;
 
-	/* Constant speed process function. */
-	SRC_ERROR		(*const_process) (SRC_STATE *state, SRC_DATA *data) ;
-
-	/* State reset. */
-	void			(*reset) (SRC_STATE *state) ;
+	int		error ;
+	int		channels ;
 
-	/* State clone. */
-	SRC_STATE		*(*copy) (SRC_STATE *state) ;
+	/* SRC_MODE_PROCESS or SRC_MODE_CALLBACK */
+	int		mode ;
 
-	/* State close. */
-	void			(*close) (SRC_STATE *state) ;
-} SRC_STATE_VT ;
+	/* Pointer to data to converter specific data. */
+	void	*private_data ;
 
-struct SRC_STATE_tag
-{
-	SRC_STATE_VT *vt ;
+	/* Varispeed process function. */
+	int		(*vari_process) (struct SRC_PRIVATE_tag *psrc, SRC_DATA *data) ;
 
-	double	last_ratio, last_position ;
+	/* Constant speed process function. */
+	int		(*const_process) (struct SRC_PRIVATE_tag *psrc, SRC_DATA *data) ;
 
-	SRC_ERROR	error ;
-	int		channels ;
+	/* State reset. */
+	void	(*reset) (struct SRC_PRIVATE_tag *psrc) ;
 
-	/* SRC_MODE_PROCESS or SRC_MODE_CALLBACK */
-	enum SRC_MODE	mode ;
+	/* State clone. */
+	int		(*copy) (struct SRC_PRIVATE_tag *from, struct SRC_PRIVATE_tag *to) ;
 
 	/* Data specific to SRC_MODE_CALLBACK. */
 	src_callback_t	callback_func ;
 	void			*user_callback_data ;
 	long			saved_frames ;
 	const float		*saved_data ;
+} SRC_PRIVATE ;
 
-	/* Pointer to data to converter specific data. */
-	void	*private_data ;
-} ;
-
-/* In src_sinc.c */
-const char* sinc_get_name (int src_enum) ;
-const char* sinc_get_description (int src_enum) ;
-
-SRC_STATE *sinc_state_new (int converter_type, int channels, SRC_ERROR *error) ;
-
-/* In src_linear.c */
-const char* linear_get_name (int src_enum) ;
-const char* linear_get_description (int src_enum) ;
-
-SRC_STATE *linear_state_new (int channels, SRC_ERROR *error) ;
-
-/*----------------------------------------------------------
-** SIMD optimized math functions.
-*/
-
-#ifdef HAVE_SSE2_INTRINSICS
-static inline int
-#ifdef USE_TARGET_ATTRIBUTE
-__attribute__((target("sse2")))
-#endif
-psf_lrintf (float x)
-{
-	return _mm_cvtss_si32 (_mm_load_ss (&x)) ;
-}
-static inline int
-#ifdef USE_TARGET_ATTRIBUTE
-__attribute__((target("sse2")))
-#endif
-psf_lrint (double x)
-{
-	return _mm_cvtsd_si32 (_mm_load_sd (&x)) ;
-}
-
-#else
-
-static inline int psf_lrintf (float x)
-{
-	return lrintf (x) ;
-} /* psf_lrintf */
-
-static inline int psf_lrint (double x)
-{
-	return lrint (x) ;
-} /* psf_lrint */
-#endif
-
+int sinc_set_converter(SRC_PRIVATE *psrc);
 /*----------------------------------------------------------
 **	Common static inline functions.
 */
@@ -228,7 +137,7 @@ static inline double
 fmod_one (double x)
 {	double res ;
 
-	res = x - psf_lrint (x) ;
+	res = x - lrint (x) ;
 	if (res < 0.0)
 		return res + 1.0 ;
 
@@ -241,5 +150,4 @@ is_bad_src_ratio (double ratio)
 } /* is_bad_src_ratio */
 
 
-#endif	/* COMMON_H_INCLUDED */
-
+#endif	/* COMMON_H_INCLUDED */