third_party/speex: adjust enc/dec buffer size

Fixes [FIRM-593]
Signed-off-by: Joshua Jun <[email protected]>

Author: jplexer

third_party/speex/config.h

@@ -78,6 +78,7 @@
 #define OVERRIDE_SPEEX_ALLOC_SCRATCH
 #define OVERRIDE_SPEEX_REALLOC
 #define OVERRIDE_SPEEX_FREE
+#define OVERRIDE_SPEEX_FREE_SCRATCH
 
 /* Override debug/warning functions */
 #define OVERRIDE_SPEEX_FATAL

third_party/speex/os_support_custom.h

@@ -10,11 +10,13 @@ extern void *kernel_zalloc_check(size_t size);
 extern void *kernel_realloc(void *ptr, size_t size);
 extern void kernel_free(void *ptr);
 
+
 /* Override memory allocation functions to use PebbleOS kernel functions */
-static inline void *speex_alloc(int size) { return kernel_zalloc_check(size); }
-static inline void *speex_alloc_scratch(int size) { return kernel_zalloc_check(size); }
-static inline void *speex_realloc(void *ptr, int size) { return kernel_realloc(ptr, size); }
+static inline void *speex_alloc(int size) { return kernel_zalloc_check((size_t)size); }
+static inline void *speex_alloc_scratch(int size) { return kernel_zalloc_check((size_t)size); }
+static inline void *speex_realloc(void *ptr, int size) { return kernel_realloc(ptr, (size_t)size); }
 static inline void speex_free(void *ptr) { kernel_free(ptr); }
+static inline void speex_free_scratch(void *ptr) { kernel_free(ptr); }
 
 /* Override debug/warning functions to be no-ops for embedded system */
 static inline void _speex_fatal(const char *str, const char *file, int line) { (void)str; (void)file; (void)line; }

third_party/speex/wscript

@@ -52,6 +52,12 @@ def build(bld):
         'DISABLE_NOTIFICATIONS',  # Disable notification functions
     ]
 
+    # Define stack sizes for encoder and decoder
+    speex_defines += [
+        'NB_ENC_STACK=(2000*sizeof(spx_sig_t))',  # ~8 KiB
+        'NB_DEC_STACK=(1500*sizeof(spx_sig_t))',  # ~6 KiB
+    ]
+
     # Compiler flags to handle warnings
     speex_cflags = [
         '-Wno-implicit-function-declaration',