Skip to content

Commit 43d3135

Browse files
timschneebtimschneeb
committed
Merge commit 'd8d9ba6636d268bce76e1f01dd094e3c35954918'
2 parents 3c22251 + d8d9ba6 commit 43d3135

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+13749
-8183
lines changed

‎libjamesdsp/subtree/Main/DSPManager/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<application
1212
android:icon="@drawable/icon"
1313
android:label="@string/app_name"
14+
android:requestLegacyExternalStorage="true"
1415
android:persistent="true"
1516
android:allowBackup="true">
1617
<activity

‎libjamesdsp/subtree/Main/DSPManager/project.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-28
14+
target=android-29
1515
proguard.config=proguard.txt
1616
android.library.reference.1=../../../appcompatSupport

‎libjamesdsp/subtree/Main/libjamesdsp/jni/jamesdsp/Android.mk‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,44 @@ LOCAL_SRC_FILES := \
4141
jdsp/Effects/eel2/numericSys/cpoly.c \
4242
jdsp/Effects/eel2/numericSys/MersenneTwister.c \
4343
jdsp/Effects/eel2/numericSys/quadprog.c \
44+
jdsp/Effects/eel2/numericSys/HPFloat/atox.c \
45+
jdsp/Effects/eel2/numericSys/HPFloat/constant.c \
46+
jdsp/Effects/eel2/numericSys/HPFloat/cxaop.c \
47+
jdsp/Effects/eel2/numericSys/HPFloat/cxbasic.c \
48+
jdsp/Effects/eel2/numericSys/HPFloat/cxconstant.c \
49+
jdsp/Effects/eel2/numericSys/HPFloat/cxconvf.c \
50+
jdsp/Effects/eel2/numericSys/HPFloat/cxexp.c \
51+
jdsp/Effects/eel2/numericSys/HPFloat/cxhypb.c \
52+
jdsp/Effects/eel2/numericSys/HPFloat/cxidiv.c \
53+
jdsp/Effects/eel2/numericSys/HPFloat/cxpow.c \
54+
jdsp/Effects/eel2/numericSys/HPFloat/cxprcmp.c \
55+
jdsp/Effects/eel2/numericSys/HPFloat/cxtrig.c \
56+
jdsp/Effects/eel2/numericSys/HPFloat/hpaconf.c \
57+
jdsp/Effects/eel2/numericSys/HPFloat/prcxpr.c \
58+
jdsp/Effects/eel2/numericSys/HPFloat/print.c \
59+
jdsp/Effects/eel2/numericSys/HPFloat/prxpr.c \
60+
jdsp/Effects/eel2/numericSys/HPFloat/sfmod.c \
61+
jdsp/Effects/eel2/numericSys/HPFloat/shift.c \
62+
jdsp/Effects/eel2/numericSys/HPFloat/xadd.c \
63+
jdsp/Effects/eel2/numericSys/HPFloat/xchcof.c \
64+
jdsp/Effects/eel2/numericSys/HPFloat/xdiv.c \
65+
jdsp/Effects/eel2/numericSys/HPFloat/xevtch.c \
66+
jdsp/Effects/eel2/numericSys/HPFloat/xexp.c \
67+
jdsp/Effects/eel2/numericSys/HPFloat/xfmod.c \
68+
jdsp/Effects/eel2/numericSys/HPFloat/xfrac.c \
69+
jdsp/Effects/eel2/numericSys/HPFloat/xhypb.c \
70+
jdsp/Effects/eel2/numericSys/HPFloat/xivhypb.c \
71+
jdsp/Effects/eel2/numericSys/HPFloat/xivtrg.c \
72+
jdsp/Effects/eel2/numericSys/HPFloat/xlog.c \
73+
jdsp/Effects/eel2/numericSys/HPFloat/xmul.c \
74+
jdsp/Effects/eel2/numericSys/HPFloat/xneg.c \
75+
jdsp/Effects/eel2/numericSys/HPFloat/xprcmp.c \
76+
jdsp/Effects/eel2/numericSys/HPFloat/xpwr.c \
77+
jdsp/Effects/eel2/numericSys/HPFloat/xsigerr.c \
78+
jdsp/Effects/eel2/numericSys/HPFloat/xsqrt.c \
79+
jdsp/Effects/eel2/numericSys/HPFloat/xtodbl.c \
80+
jdsp/Effects/eel2/numericSys/HPFloat/xtoflt.c \
81+
jdsp/Effects/eel2/numericSys/HPFloat/xtrig.c \
4482
jdsp/Effects/eel2/s_str.c \
4583
jdsp/Effects/eel2/fft.c \
4684
jdsp/Effects/eel2/nseel-compiler.c \

‎libjamesdsp/subtree/Main/libjamesdsp/jni/jamesdsp/jdsp/Effects/dynamic.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,6 @@ void FFTCompanderSetavgBW(FFTCompander *cm, double avgBW)
393393
}
394394
void FFTCompanderInit(FFTCompander *cm, float fs)
395395
{
396-
//memset(cm, 0, sizeof(FFTCompander));
397396
unsigned int i;
398397
const float oX[10] = { 750, 1500, 3000, 6000, 12000, 24000, 48000, 96000, 192000, 256000 };
399398
const float oY[10] = { 24, 48, 96, 192, 384, 768, 1536, 3072, 6144, 8192 };
@@ -448,6 +447,8 @@ void FFTCompanderInit(FFTCompander *cm, float fs)
448447
sum += cm->analysisWnd[i];
449448
FFTCompanderSetavgBW(cm, 1.2);
450449
cm->spectralRate = fs / (float)cm->fftLen * (float)ANALYSIS_OVERLAP_DRS;
450+
for (i = 0; i < HALFWNDLEN_DRS; i++)
451+
cm->oldBuf[i] = -20.0f;
451452
}
452453
void CompressorConstructor(JamesDSPLib *jdsp)
453454
{

‎libjamesdsp/subtree/Main/libjamesdsp/jni/jamesdsp/jdsp/Effects/eel2/eelCommon.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if defined(TURN_ON_VST)
1+
#ifdef TURN_ON_VST
22
// Config a custom CLI buffer
33
#define CUSTOM_CMD
44
#endif

‎libjamesdsp/subtree/Main/libjamesdsp/jni/jamesdsp/jdsp/Effects/eel2/ns-eel-int.h‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ typedef struct {
116116
typedef struct
117117
{
118118
int32_t slot, inuse;
119-
int32_t *map;
120-
s_str *m_literal_strings;
121-
} eel_string_context_state;
119+
void **memRegion;
120+
char *type;
121+
} eel_builtin_memRegion;
122122
#define MAX_CMD_LEN 8192
123123
#define HISTORY_COUNT 15000
124124
#include "cpthread.h"
@@ -141,14 +141,7 @@ typedef struct
141141
} abstractThreads;
142142
typedef struct
143143
{
144-
uint32_t numberOfThreads;
145-
uint32_t threadMap[1024];
146-
abstractThreads *codePtrThreadSink[1024];
147144
pthread_mutex_t globalLocker;
148-
uint32_t numberOfConvolver;
149-
uint32_t *convolverMap;
150-
uint32_t *convolverType;
151-
void **convolverSink;
152145
const char *(*func_check)(const char *fn_name, void *user); // return error message if not permitted
153146
void *func_check_user;
154147
float **varTable_Values;
@@ -182,7 +175,7 @@ typedef struct
182175
codeHandleType *tmpCodeHandle;
183176
float ram_state[NSEEL_RAM_ITEMSPERBLOCK];
184177
void *caller_this;
185-
eel_string_context_state *m_string_context;
178+
eel_builtin_memRegion *region_context;
186179
char printfbuf[20000];
187180
} compileContext;
188181
void *NSEEL_PProc_RAM(void *data, int32_t data_size, compileContext *ctx);

‎libjamesdsp/subtree/Main/libjamesdsp/jni/jamesdsp/jdsp/Effects/eel2/ns-eel.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ typedef uintptr_t UINT_PTR;
4040
#ifndef min
4141
#define min(x,y) ((x)<(y)?(x):(y))
4242
#endif
43-
#if !defined(max)
43+
#ifndef max
4444
#define max(x,y) ((x)<(y)?(y):(x))
4545
#endif
4646
#ifndef _WIN32
@@ -73,7 +73,7 @@ void NSEEL_start(); // Init global variables
7373
void NSEEL_quit(); // Delete global variables
7474
int32_t *NSEEL_getstats(); // returns a pointer to 5 ints... source bytes, static code bytes, call code bytes, data bytes, number of code handles
7575
void NSEEL_VM_freevars(NSEEL_VMCTX _ctx);
76-
void NSEEL_init_string(NSEEL_VMCTX ctx);
76+
void NSEEL_init_memRegion(NSEEL_VMCTX ctx);
7777
NSEEL_VMCTX NSEEL_VM_alloc(); // return a handle
7878
void NSEEL_VM_free(NSEEL_VMCTX ctx); // free when done with a VM and ALL of its code have been freed, as well
7979
// validateFunc can return error message if not permitted
@@ -108,7 +108,6 @@ int32_t *NSEEL_code_getstats(NSEEL_CODEHANDLE code); // 4 ints...source bytes, s
108108
#include <limits.h>
109109
#define NSEEL_NATIVE_FLT_MAX_INT (1 << FLT_MANT_DIG) // Next value will no longer be accurately represented
110110
#define NSEEL_MAX_FUNCTION_SIZE_FOR_INLINE 2048
111-
#define NSEEL_RAM_ITEMSPERBLOCK_LOG2 24 // How many float precision floating point items per block
112111
#define NSEEL_RAM_ITEMSPERBLOCK NSEEL_NATIVE_FLT_MAX_INT // Must be smaller or equal than max floating pointing representable integer
113112
#define EEL_BC_TYPE int32_t
114113
#ifdef CUSTOM_CMD

0 commit comments

Comments
 (0)