Skip to content
Snippets Groups Projects
Commit aa36750e authored by moon2's avatar moon2 :speech_balloon:
Browse files

(external) bl00mbox: more inlining, performance++

parent 93e13a9f
No related branches found
No related tags found
1 merge request!389(external) bl00mbox: more inlining, performance++
Pipeline #8235 passed
Stage: check
Stage: build
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 80 additions and 109 deletions
components/bl00mbox/bl00mbox_radspa_requirements.c
+ 0
− 37
View file @ aa36750e
......@@ -58,41 +58,4 @@ uint32_t radspa_sct_to_rel_freq(int16_t sct, int16_t undersample_pow){
return ret;
}
int16_t radspa_clip(int32_t a){
if(a > 32767){
return 32767;
} else if(a < -32767){
return -32767;
}
return a;
}
int16_t radspa_add_sat(int32_t a, int32_t b){ return radspa_clip(a+b); }
int32_t radspa_mult_shift(int32_t a, int32_t b){ return radspa_clip((a*b)>>15); }
int32_t radspa_gain(int32_t a, int32_t b){ return radspa_clip((a*b)>>12); }
int16_t radspa_trigger_start(int16_t velocity, int16_t * hist){
int16_t ret = ((* hist) > 0) ? -velocity : velocity;
(* hist) = ret;
return ret;
}
int16_t radspa_trigger_stop(int16_t * hist){
(* hist) = 0;
return 0;
}
int16_t radspa_trigger_get(int16_t trigger_signal, int16_t * hist){
int16_t ret = 0;
if((!trigger_signal) && (* hist)){ //stop
ret = -1;
} else if(trigger_signal > 0 ){
if((* hist) <= 0) ret = trigger_signal;
} else if(trigger_signal < 0 ){
if((* hist) >= 0) ret = -trigger_signal;
}
(* hist) = trigger_signal;
return ret;
}
int16_t radspa_random(){ return xoroshiro64star()>>16; }
components/bl00mbox/plugins/lowpass.c
+ 24
− 59
View file @ aa36750e
#include "lowpass.h"
//#define LOWPASS_DEBUG_PRINT
#ifdef LOWPASS_DEBUG_PRINT
#include <stdio.h>
#endif
radspa_t * lowpass_create(uint32_t init_var);
radspa_descriptor_t lowpass_desc = {
.name = "lowpass",
......@@ -23,63 +17,37 @@ radspa_descriptor_t lowpass_desc = {
#define LOWPASS_GAIN 4
#define LOWPASS_INTERNAL_SHIFT 14
#define LOWPASS_OUT_COEFF_SHIFT 11
static void coeff_shift(uint64_t coeff, int32_t *shift, int32_t * shifted_coeff) {
int32_t ret = 22;
uint64_t ret_coeff = coeff >> (32-ret);
while(1){
if(ret > 31){
ret = 31;
ret_coeff = coeff >> (32-ret);
break;
}
if(ret < (LOWPASS_INTERNAL_SHIFT)){
ret = (LOWPASS_INTERNAL_SHIFT);
ret_coeff = coeff >> (32-ret);
break;
}
if(ret_coeff > (1UL<<14)){
ret -= 3;
ret_coeff = coeff >> (32-ret);
} else if (ret_coeff < (1UL<<11)){
ret += 3;
ret_coeff = coeff >> (32-ret);
} else {
break;
}
}
* shift = ret;
* shifted_coeff = (int32_t) ret_coeff;
}
#define LOWPASS_OUT_COEFF_SHIFT 30
#define LOWPASS_SUM_SHIFT 25
static void set_lowpass_coeffs(lowpass_data_t * data, int32_t freq, int32_t mq){
if(freq < 15.) freq = 15.;
if(freq > 15000.) freq = 15000.;
if(mq < 130) mq = 130;
if(mq < 140) mq = 140;
int32_t K = 15287; // 2*48000/6.28
int32_t omega = freq;
int32_t mq_rec = (1UL<<31)/(mq+1);
int32_t A[3];
A[0] = K * K;
A[1] = K * 1000;
A[1] = (int64_t) A[1] * omega / (mq+1);
A[1] = K * omega * 8;
A[1] = ((int64_t) A[1] * mq_rec) >> 32;
A[1] *= 250;
A[2] = omega*omega;
int32_t sum_a = A[0] + A[1] + A[2];
int64_t round = A[2];
// slow, figure out smth smarther:
int32_t sum_a_rec = (1ULL<<(32 + (LOWPASS_SUM_SHIFT))) / (A[0] + A[1] + A[2]);
round = (round << 32) / sum_a;
int32_t shift;
int32_t shifted_coeff;
coeff_shift(round, &shift, &shifted_coeff);
data->in_coeff_shift = shift - (LOWPASS_INTERNAL_SHIFT);
data->in_coeff = shifted_coeff;
int32_t tmp;
round = 2.*(A[2]-A[0]);
data->out_coeff[0] = round * (1LL<<(LOWPASS_OUT_COEFF_SHIFT)) / sum_a;
tmp = (int64_t) A[2] * sum_a_rec >> 32;
data->in_coeff = tmp << (32-LOWPASS_SUM_SHIFT);
round = (A[0]-A[1]+A[2]);
data->out_coeff[1] = round * (1LL<<(LOWPASS_OUT_COEFF_SHIFT)) / sum_a;
tmp = 2.*(A[2]-A[0]);
tmp = ((int64_t) tmp * sum_a_rec) >> 32;
data->out_coeff[0] = tmp<<((LOWPASS_OUT_COEFF_SHIFT) - (LOWPASS_SUM_SHIFT));
tmp = (A[0]-A[1]+A[2]);
tmp = ((int64_t) tmp * sum_a_rec) >> 32;
data->out_coeff[1] = tmp<<((LOWPASS_OUT_COEFF_SHIFT) - (LOWPASS_SUM_SHIFT));
}
......@@ -100,11 +68,6 @@ void lowpass_run(radspa_t * lowpass, uint16_t num_samples, uint32_t render_pass_
if((freq != data->prev_freq) | (q != data->prev_q)){
set_lowpass_coeffs(data, freq, q);
#ifdef LOWPASS_DEBUG_PRINT
printf("\nfreq: %ld, q: %d\n", freq, q);
printf("in_coeff: %ld >> %ld, ", data->in_coeff, data->in_coeff_shift);
printf("out_coeffs: %ld, %ld\n", data->out_coeff[0], data->out_coeff[1]);
#endif
data->prev_freq = freq;
data->prev_q = q;
}
......@@ -121,11 +84,13 @@ void lowpass_run(radspa_t * lowpass, uint16_t num_samples, uint32_t render_pass_
int8_t pos = data->pos - i - 1;
if(pos < 0) pos += 3;
in_acc += (2-i)*data->in_history[pos];
ret -= (((int64_t) data->out_history[pos]) * data->out_coeff[i]) >> (LOWPASS_OUT_COEFF_SHIFT);
ret -= (((int64_t) data->out_history[pos]) * data->out_coeff[i]) >> 32;
}
ret += (in_acc * data->in_coeff) >> data->in_coeff_shift;
ret = ret << (32 - LOWPASS_OUT_COEFF_SHIFT);
in_acc = in_acc << (LOWPASS_INTERNAL_SHIFT);
in_acc = ((int64_t) in_acc * data->in_coeff) >> 32;
ret += in_acc;
data->out_history[data->pos] = ret;
......
components/bl00mbox/plugins/lowpass.h
+ 0
− 1
View file @ aa36750e
......@@ -5,7 +5,6 @@
typedef struct {
int32_t in_history[3];
int32_t in_coeff;
int32_t in_coeff_shift;
int32_t out_history[3];
int32_t out_coeff[2];
......
components/bl00mbox/plugins/sampler.c
+ 6
− 0
View file @ aa36750e
......@@ -48,6 +48,7 @@ void sampler_run(radspa_t * sampler, uint16_t num_samples, uint32_t render_pass_
if(sample_len >= buffer_size) sample_len = buffer_size - 1;
if(data->read_head_pos >= buffer_size) data->read_head_pos = buffer_size - 1;
bool buffer_all_zeroes = true;
for(uint16_t i = 0; i < num_samples; i++){
int16_t trigger = radspa_trigger_get(radspa_signal_get_value(trigger_sig, i, render_pass_id), &(data->trigger_prev));
int16_t rec_trigger = radspa_trigger_get(radspa_signal_get_value(rec_trigger_sig, i, render_pass_id), &(data->rec_trigger_prev));
......@@ -100,6 +101,7 @@ void sampler_run(radspa_t * sampler, uint16_t num_samples, uint32_t render_pass_
data->read_head_pos = sample_len;
}
if(data->read_head_pos < sample_len){
uint32_t sample_offset_pos = data->read_head_pos + sample_start;
if(sample_offset_pos >= sample_len) sample_offset_pos -= sample_len;
......@@ -121,12 +123,16 @@ void sampler_run(radspa_t * sampler, uint16_t num_samples, uint32_t render_pass_
data->read_head_pos = (data->read_head_pos_long * 699) >> 25; // equiv to _/48000 (acc 0.008%)
}
} else {
if(data->buffer_all_zeroes) continue;
//ret = (ret * 255)>>8; // avoid dc clicks with bad samples
ret = 0;
}
if(ret) buffer_all_zeroes = false;
radspa_signal_set_value(output_sig, i, ret);
}
}
data->buffer_all_zeroes = buffer_all_zeroes;
buf32[READ_HEAD_POS/2] = data->read_head_pos;
buf32[SAMPLE_START/2] = sample_start;
buf32[SAMPLE_LEN/2] = sample_len;
......
components/bl00mbox/plugins/sampler.h
+ 1
− 0
View file @ aa36750e
......@@ -13,6 +13,7 @@ typedef struct {
int16_t volume;
uint32_t pitch_shift_mult;
bool rec_active;
bool buffer_all_zeroes;
} sampler_data_t;
extern radspa_descriptor_t sampler_desc;
......
components/bl00mbox/radspa/radspa.h
+ 41
− 12
View file @ aa36750e
......@@ -106,6 +106,47 @@ typedef struct _radspa_t{
int16_t * plugin_table;
} radspa_t;
/* SIGNAL HELPERS
*/
inline int16_t radspa_clip(int32_t a){
if(a > 32767){
return 32767;
} else if(a < -32767){
return -32767;
}
return a;
}
inline int16_t radspa_add_sat(int32_t a, int32_t b){ return radspa_clip(a+b); }
inline int32_t radspa_mult_shift(int32_t a, int32_t b){ return radspa_clip((a*b)>>15); }
inline int32_t radspa_gain(int32_t a, int32_t b){ return radspa_clip((a*b)>>12); }
inline int16_t radspa_trigger_start(int16_t velocity, int16_t * hist){
int16_t ret = ((* hist) > 0) ? -velocity : velocity;
(* hist) = ret;
return ret;
}
inline int16_t radspa_trigger_stop(int16_t * hist){
(* hist) = 0;
return 0;
}
inline int16_t radspa_trigger_get(int16_t trigger_signal, int16_t * hist){
int16_t ret = 0;
if((!trigger_signal) && (* hist)){ //stop
ret = -1;
} else if(trigger_signal > 0 ){
if((* hist) <= 0) ret = trigger_signal;
} else if(trigger_signal < 0 ){
if((* hist) >= 0) ret = -trigger_signal;
}
(* hist) = trigger_signal;
return ret;
}
/* REQUIREMENTS
* Hosts must provide implementations for the following functions:
*/
......@@ -119,17 +160,5 @@ extern uint32_t radspa_sct_to_rel_freq(int16_t sct, int16_t undersample_pow);
// Return 1 if the buffer wasn't rendered already, 0 otherwise.
extern bool radspa_host_request_buffer_render(int16_t * buf);
// limit a to -32767..32767
extern int16_t radspa_clip(int32_t a);
// saturating int16 addition
extern int16_t radspa_add_sat(int32_t a, int32_t b);
// (a*b)>>15
extern int32_t radspa_mult_shift(int32_t a, int32_t b);
// (a*b)>>12
extern int32_t radspa_gain(int32_t a, int32_t b);
extern int16_t radspa_trigger_start(int16_t velocity, int16_t * hist);
extern int16_t radspa_trigger_stop(int16_t * hist);
extern int16_t radspa_trigger_get(int16_t trigger_signal, int16_t * hist);
extern int16_t radspa_random();
components/bl00mbox/radspa/radspa_helpers.c
+ 7
− 0
View file @ aa36750e
......@@ -3,6 +3,13 @@
extern inline int16_t radspa_signal_get_value(radspa_signal_t * sig, int16_t index, uint32_t render_pass_id);
extern inline void radspa_signal_set_value(radspa_signal_t * sig, int16_t index, int16_t value);
extern inline int16_t radspa_clip(int32_t a);
extern inline int16_t radspa_add_sat(int32_t a, int32_t b);
extern inline int32_t radspa_mult_shift(int32_t a, int32_t b);
extern inline int32_t radspa_gain(int32_t a, int32_t b);
extern inline int16_t radspa_trigger_start(int16_t velocity, int16_t * hist);
extern inline int16_t radspa_trigger_stop(int16_t * hist);
extern inline int16_t radspa_trigger_get(int16_t trigger_signal, int16_t * hist);
#define RADSPA_SIGNAL_CACHING
// get signal struct from a signal index
......
components/bl00mbox/radspa/radspa_helpers.h
+ 1
− 0
View file @ aa36750e
......@@ -42,3 +42,4 @@ inline void radspa_signal_set_value(radspa_signal_t * sig, int16_t index, int16_
// get signal struct from a signal index
radspa_signal_t * radspa_signal_get_by_index(radspa_t * plugin, uint16_t signal_index);
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment