Stereo packed mode implemented; mix mode switches collapsed

Author: dukesrg

platform/nutekt-digital/looper/looper.hpp

@@ -10,18 +10,18 @@
  */
 
 #include "fx_api.h"
-//#include "fixed_math.h"
+#include "fixed_math.h"
 #include "float_math.h"
 #include "osc_api.h"
 #include "userrevfx.h"
 
 #include "delayline.hpp"
 
-#define MAX_MEM (2400 * 1024) //exact BPM limits, 32K reserved
-#define BUF_SIZE (MAX_MEM / (sizeof(float) * 2))
+#define MAX_MEM (2400 * 1024) // exact BPM limits, 32K reserved
+#define BUF_SIZE (MAX_MEM / (sizeof(float) * 2)) // loop buffer size in samples, stereo
 #define BEAT_MAX 16 // maximum loop length, beats
 #define BEAT_MIN 16 // minimum loop length, beat fractions
-#define BEAT_STEPS 9 // = log2(BEAT_MAX * BEAT_MIN) + 1
+#define BEAT_STEPS 9 // precalculated = log2(BEAT_MAX * BEAT_MIN) + 1
 
 enum {
   mix_mode_overwrite = 0,
@@ -37,19 +37,19 @@ enum {
   record_format_mono_packed,
   record_format_count
 };
-/*
-typedef struct {
-  q15_t a;
-  q15_t b;
-} q15pair_t;
 
 typedef union {
  float f;
-  q15pair_t q;
-} q15f32_t;
+ struct {
+ q15_t a;
+ q15_t b;
+  } q;
+} __attribute__ ((packed)) f32packed_t;
+
+#define f32pack(f1,f2) (f32packed_t){.q={f32_to_q15(f1),f32_to_q15(f2)}}.f
+#define f32unpack1(f1) (q15_to_f32(((f32packed_t){.f=f1}).q.a))
+#define f32unpack2(f1) (q15_to_f32(((f32packed_t){.f=f1}).q.b))
 
-#define f32x2_to_q15(f1, f2) (q15pair_t){f32_to_q15(f1), f32_to_q15(f2)}
-*/
 static dsp::DelayLine s_delay;
 
 static __sdram float s_delay_ram[BUF_SIZE * 2];
@@ -84,62 +84,41 @@ void looper_process(float *xn, uint32_t frames)
  float valf, valf2;
  switch (s_record_format) {
  case record_format_stereo:
- case record_format_stereo_packed: //ToDo
     len *= 2;
- switch (s_mix_mode) {
- case mix_mode_overwrite:
- for (; x != x_e; x) {
-        valf = s_delay.read(len);
-        s_delay.write(*x);
-        *(x++) = (*x + valf) * .5f;
-      }
- break;
- case mix_mode_play:
- for (; x != x_e;) {
-        valf = s_delay.read(len);
-        *(x++) = (*x + valf) * .5f;
-      }
- break;
- case mix_mode_overdub:
- for (; x != x_e; x++) {
-        valf = s_delay.read(len);
-        *(x++) = (*x + valf) * .5f;
-        s_delay.write(valf);
-      }
- break;
- default:
- break;
+ for (; x < x_e;) {
+      valf2 = valf = s_delay.read(len);
+ if (s_mix_mode == mix_mode_overwrite)
+        valf2 = *x;
+ else if (s_mix_mode == mix_mode_overdub)
+        valf2 += *x;
+      s_delay.write(valf2);
+      *(x++) = (*x + valf) * .5f;
+    }
+ break;
+ case record_format_stereo_packed:
+ for (; x < x_e;) {
+      valf2 = valf = s_delay.read(len);
+ if (s_mix_mode == mix_mode_overwrite)
+        valf2 = f32pack(*x, x[1]);
+ else if (s_mix_mode == mix_mode_overdub)
+        valf2 = f32pack(*x + f32unpack1(valf), x[1] + f32unpack2(valf));
+      s_delay.write(valf2);
+      *(x++) = (*x + f32unpack1(valf)) * .5f;
+      *(x++) = (*x + f32unpack2(valf)) * .5f;
     }
  break;
- case record_format_mono:
  case record_format_mono_packed: //ToDo
- switch (s_mix_mode) {
- case mix_mode_overwrite:
- for (; x != x_e; x) {
-        valf = s_delay.read(len);
-        s_delay.write((*x + x[1]) * .5f);
-        *(x++) = (*x + valf) * .5f;
-        *(x++) = (*x + valf) * .5f;
-      }
- break;
- case mix_mode_play:
- for (; x != x_e;) {
-        valf = s_delay.read(len);
-        *(x++) = (*x + valf) * .5f;
-        *(x++) = (*x + valf) * .5f;
-      }
- break;
- case mix_mode_overdub:
- for (; x != x_e; x) {
-        valf = s_delay.read(len) ;
-        valf += (*x + x[1]) * .5f;
-        *(x++) = (*x + valf) * .5f;
-        *(x++) = (*x + valf) * .5f;
-        s_delay.write(valf);
-      }
- break;
- default:
- break;
+
+ case record_format_mono:
+ for (; x < x_e;) {
+      valf2 = valf = s_delay.read(len);
+ if (s_mix_mode == mix_mode_overwrite)
+        valf2 = (*x + x[1]) * .5f;
+ else if (s_mix_mode == mix_mode_overdub)
+        valf2 += (*x + x[1]) * .5f;
+      s_delay.write(valf2);
+      *(x++) = (*x + valf) * .5f;
+      *(x++) = (*x + valf) * .5f;
     }
  break;
  default:

platform/nutekt-digital/looper/manifest.json

@@ -6,7 +6,7 @@
  "api" : "1.1-0",
  "dev_id" : 1701541188,
  "prg_id" : 0,
- "version" : "0.3-0",
+ "version" : "0.4-0",
  "name" : "Looper",
  "num_param" : 0
     }