diff -rNu rb/apps/dsp.c rb_s80/apps/dsp.c --- rb/apps/dsp.c 2011-04-17 15:49:42.379390900 +0800 +++ rb_s80/apps/dsp.c 2011-08-01 13:43:26.750000000 +0800 @@ -33,6 +33,7 @@ #include "buffer.h" #include "fixedpoint.h" #include "fracmul.h" +#include "dspk.h" /* Define LOGF_ENABLE to enable logf output in this file */ /*#define LOGF_ENABLE*/ @@ -123,6 +124,43 @@ /* 8ch */ }; +struct space80_data_e +{ + int32_t dl_0[728]; + int32_t dl_1[700]; + int32_t dl_2[680]; + int32_t dl_3[654]; + int32_t dl_4[610]; + int32_t dl_5[587]; + int32_t dl_6[13]; + int32_t dl_7[12]; +}; + +struct space80_data +{ + int32_t c_decay; + int32_t c_freq; + int32_t c_gain; + int32_t c_mix; + + int32_t *idx_w0; + int32_t *idx_r0; + int32_t *idx_w1; + int32_t *idx_r1; + int32_t *idx_w2; + int32_t *idx_r2; + int32_t *idx_w3; + int32_t *idx_r3; + int32_t *idx_w4; + int32_t *idx_r4; + int32_t *idx_w5; + int32_t *idx_r5; + int32_t *idx_w6; + int32_t *idx_r6; + int32_t *idx_w7; + int32_t *idx_r7; +}; + /* Current setup is one lowshelf filters three peaking filters and one * highshelf filter. Varying the number of shelving filters make no sense, * but adding peaking filters is possible. @@ -190,6 +228,7 @@ way */ channels_process_dsp_fn_type apply_gain; channels_process_fn_type apply_crossfeed; + channels_process_fn_type apply_space80; channels_process_fn_type eq_process; channels_process_fn_type channels_process; channels_process_fn_type compressor_process; @@ -207,6 +246,32 @@ .index = (int32_t *)crossfeed_data.delay }; +struct space80_data_e space80_data_e; + +struct space80_data space80_data IDATA_ATTR = +{ + .c_decay = 0x73333333, + .c_freq = 0x1fffffff, + .c_gain = 0x3fffffff, + .c_mix = 0x33333333, + .idx_w0 = space80_data_e.dl_0, + .idx_r0 = space80_data_e.dl_0+1, + .idx_w1 = space80_data_e.dl_1, + .idx_r1 = space80_data_e.dl_1+1, + .idx_w2 = space80_data_e.dl_2, + .idx_r2 = space80_data_e.dl_2+1, + .idx_w3 = space80_data_e.dl_3, + .idx_r3 = space80_data_e.dl_3+1, + .idx_w4 = space80_data_e.dl_4, + .idx_r4 = space80_data_e.dl_4+1, + .idx_w5 = space80_data_e.dl_5, + .idx_r5 = space80_data_e.dl_5+1, + .idx_w6 = space80_data_e.dl_6, + .idx_r6 = space80_data_e.dl_6+1, + .idx_w7 = space80_data_e.dl_7, + .idx_r7 = space80_data_e.dl_7+1 +}; + /* Equalizer */ static struct eq_state eq_data; /* A */ @@ -233,6 +298,7 @@ static long album_peak; static long replaygain; static bool crossfeed_enabled; +static bool space80_enabled; #define AUDIO_DSP (dsp_conf[CODEC_IDX_AUDIO]) #define VOICE_DSP (dsp_conf[CODEC_IDX_VOICE]) @@ -874,6 +940,114 @@ c[2] <<= 4; } +static void apply_space80(int count, int32_t *buf[]) +{ + int32_t c_decay = space80_data.c_decay; + int32_t c_freq = space80_data.c_freq; + int32_t c_gain = space80_data.c_gain; + int32_t c_mix = space80_data.c_mix; + + int32_t *idx_dl0 = &space80_data_e.dl_0[0] + 728; + int32_t *idx_dl1 = &space80_data_e.dl_1[0] + 700; + int32_t *idx_dl2 = &space80_data_e.dl_2[0] + 680; + int32_t *idx_dl3 = &space80_data_e.dl_3[0] + 654; + int32_t *idx_dl4 = &space80_data_e.dl_4[0] + 610; + int32_t *idx_dl5 = &space80_data_e.dl_5[0] + 587; + int32_t *idx_dl6 = &space80_data_e.dl_6[0] + 13; + int32_t *idx_dl7 = &space80_data_e.dl_7[0] + 12; + + int32_t *idx_w0 = space80_data.idx_w0; + int32_t *idx_r0 = space80_data.idx_r0; + int32_t *idx_w1 = space80_data.idx_w1; + int32_t *idx_r1 = space80_data.idx_r1; + int32_t *idx_w2 = space80_data.idx_w2; + int32_t *idx_r2 = space80_data.idx_r2; + int32_t *idx_w3 = space80_data.idx_w3; + int32_t *idx_r3 = space80_data.idx_r3; + int32_t *idx_w4 = space80_data.idx_w4; + int32_t *idx_r4 = space80_data.idx_r4; + int32_t *idx_w5 = space80_data.idx_w5; + int32_t *idx_r5 = space80_data.idx_r5; + int32_t *idx_w6 = space80_data.idx_w6; + int32_t *idx_r6 = space80_data.idx_r6; + int32_t *idx_w7 = space80_data.idx_w7; + int32_t *idx_r7 = space80_data.idx_r7; + + int32_t t_wet, t_c, t_d[2]; + + int i; + + for (i = 0; i < count; i++) + { + t_wet = FRACMUL((buf[0][i] >> 4) + (buf[0][i] >> 6) + (buf[1][i] >> 4) + (buf[1][i] >> 6), c_mix); + buf[0][i] -= buf[0][i] >> 4; + buf[1][i] -= buf[1][i] >> 4; + buf[0][i] -= FRACMUL(buf[0][i], c_mix); + buf[1][i] -= FRACMUL(buf[1][i], c_mix); + *idx_w0 = t_wet + FRACMUL(*idx_r0, c_decay); + *idx_w1 = t_wet + FRACMUL(*idx_r1, c_decay); + *idx_w2 = t_wet + FRACMUL(*idx_r2, c_decay); + *idx_w3 = t_wet + FRACMUL(*idx_r3, c_decay); + *idx_w4 = t_wet + FRACMUL(*idx_r4, c_decay); + *idx_w5 = t_wet + FRACMUL(*idx_r5, c_decay); + t_c = FRACMUL(*idx_r0 + *idx_r1 + *idx_r2 + *idx_r3 + *idx_r4 + *idx_r5, c_gain); + *idx_w6 = t_c - FRACMUL(*idx_r6, c_freq); + t_d[0] = *idx_r6 + FRACMUL(*idx_w6, c_freq); + *idx_w7 = t_d[0] - FRACMUL(*idx_r7, c_freq); + t_d[1] = *idx_r7 + FRACMUL(*idx_w7, c_freq); + buf[0][i] += t_d[1]; + buf[1][i] -= t_d[1]; + + if(++idx_w0 >= idx_dl0) idx_w0 = idx_dl0 - 728; + if(++idx_r0 >= idx_dl0) idx_r0 = idx_dl0 - 728; + if(++idx_w1 >= idx_dl1) idx_w1 = idx_dl1 - 700; + if(++idx_r1 >= idx_dl1) idx_r1 = idx_dl1 - 700; + if(++idx_w2 >= idx_dl2) idx_w2 = idx_dl2 - 680; + if(++idx_r2 >= idx_dl2) idx_r2 = idx_dl2 - 680; + if(++idx_w3 >= idx_dl3) idx_w3 = idx_dl3 - 654; + if(++idx_r3 >= idx_dl3) idx_r3 = idx_dl3 - 654; + if(++idx_w4 >= idx_dl4) idx_w4 = idx_dl4 - 610; + if(++idx_r4 >= idx_dl4) idx_r4 = idx_dl4 - 610; + if(++idx_w5 >= idx_dl5) idx_w5 = idx_dl5 - 587; + if(++idx_r5 >= idx_dl5) idx_r5 = idx_dl5 - 587; + if(++idx_w6 >= idx_dl6) idx_w6 = idx_dl6 - 13; + if(++idx_r6 >= idx_dl6) idx_r6 = idx_dl6 - 13; + if(++idx_w7 >= idx_dl7) idx_w7 = idx_dl7 - 12; + if(++idx_r7 >= idx_dl7) idx_r7 = idx_dl7 - 12; + } + space80_data.idx_w0 = idx_w0; + space80_data.idx_r0 = idx_r0; + space80_data.idx_w1 = idx_w1; + space80_data.idx_r1 = idx_r1; + space80_data.idx_w2 = idx_w2; + space80_data.idx_r2 = idx_r2; + space80_data.idx_w3 = idx_w3; + space80_data.idx_r3 = idx_r3; + space80_data.idx_w4 = idx_w4; + space80_data.idx_r4 = idx_r4; + space80_data.idx_w5 = idx_w5; + space80_data.idx_r5 = idx_r5; + space80_data.idx_w6 = idx_w6; + space80_data.idx_r6 = idx_r6; + space80_data.idx_w7 = idx_w7; + space80_data.idx_r7 = idx_r7; +} + +void dsp_set_space80(bool enable) +{ + space80_enabled = enable; + AUDIO_DSP.apply_space80 = (enable && AUDIO_DSP.data.num_channels > 1) + ? apply_space80 : NULL; +} + +void dsp_set_space80_params(long decay, long freq, long gain, long mix) +{ + space80_data.c_decay = log15(0x5c28f5c * (decay / 5)); + space80_data.c_freq = 0x6666666 * (freq / 5); + space80_data.c_gain = 0x6666666 * (gain / 5); + space80_data.c_mix = 0x6666666 * (mix / 5); +} + /* Apply a constant gain to the samples (e.g., for ReplayGain). * Note that this must be called before the resampler. */ @@ -1258,6 +1432,9 @@ if (dsp->apply_crossfeed) dsp->apply_crossfeed(chunk, t2); + if (dsp->apply_space80) + dsp->apply_space80(chunk, t2); + if (dsp->eq_process) dsp->eq_process(chunk, t2); @@ -1361,6 +1538,7 @@ sample_output_new_format(dsp); if (dsp == &AUDIO_DSP) dsp_set_crossfeed(crossfeed_enabled); + dsp_set_space80(space80_enabled); } intptr_t dsp_configure(struct dsp_config *dsp, int setting, intptr_t value) diff -rNu rb/apps/dsp.h rb_s80/apps/dsp.h --- rb/apps/dsp.h 2011-04-17 15:49:42.478396500 +0800 +++ rb_s80/apps/dsp.h 2011-08-01 12:36:16.828125000 +0800 @@ -54,7 +54,8 @@ DSP_SET_ALBUM_GAIN, DSP_SET_TRACK_PEAK, DSP_SET_ALBUM_PEAK, - DSP_CROSSFEED + DSP_CROSSFEED, + DSP_SPACE80 }; struct dsp_config; @@ -71,6 +72,8 @@ void dsp_set_crossfeed_direct_gain(int gain); void dsp_set_crossfeed_cross_params(long lf_gain, long hf_gain, long cutoff); +void dsp_set_space80(bool enable); +void dsp_set_space80_params(long decay, long freq, long gain, long mix); void dsp_set_eq(bool enable); void dsp_set_eq_precut(int precut); void dsp_set_eq_coefs(int band); diff -rNu rb/apps/dspk.h rb_s80/apps/dspk.h --- rb/apps/dspk.h 1970-01-01 08:00:00.000000000 +0800 +++ rb_s80/apps/dspk.h 2011-08-01 13:42:53.718750000 +0800 @@ -0,0 +1,39 @@ +long log15(long x) { + if(x>=0) { + if(x>=0x40000000) return ((x&0x3fffffff)>>3)+0x78000000;//15 + if(x>=0x20000000) return ((x&0x1fffffff)>>2)+0x70000000;//14 + if(x>=0x10000000) return ((x&0xfffffff)>>1)+0x68000000; //13 + if(x>=0x8000000) return (x&0x7ffffff)+0x60000000; //12 + if(x>=0x4000000) return ((x&0x3ffffff)<<1)+0x58000000; //11 + if(x>=0x2000000) return ((x&0x1ffffff)<<2)+0x50000000; //10 + if(x>=0x1000000) return ((x&0xffffff)<<3)+0x48000000; //9 + if(x>=0x800000) return ((x&0x7fffff)<<4)+0x40000000; //8 + if(x>=0x400000) return ((x&0x3fffff)<<5)+0x38000000; //7 + if(x>=0x200000) return ((x&0x1fffff)<<6)+0x30000000; //6 + if(x>=0x100000) return ((x&0xfffff)<<7)+0x28000000; //5 + if(x>=0x80000) return ((x&0x7ffff)<<8)+0x20000000; //4 + if(x>=0x40000) return ((x&0x3ffff)<<9)+0x18000000; //3 + if(x>=0x20000) return ((x&0x1ffff)<<10)+0x10000000; //2 + if(x>=0x10000) return ((x&0xffff)<<11)+0x8000000; //1 + return x<<11; + } + else { + x=~x+1; + if(x>=0x40000000) return ~(((x&0x3fffffff)>>3)+0x78000000)+1; + if(x>=0x20000000) return ~(((x&0x1fffffff)>>2)+0x70000000)+1; + if(x>=0x10000000) return ~(((x&0xfffffff)>>1)+0x68000000)+1; + if(x>=0x8000000) return ~((x&0x7ffffff)+0x60000000)+1; + if(x>=0x4000000) return ~(((x&0x3ffffff)<<1)+0x58000000)+1; + if(x>=0x2000000) return ~(((x&0x1ffffff)<<2)+0x50000000)+1; + if(x>=0x1000000) return ~(((x&0xffffff)<<3)+0x48000000)+1; + if(x>=0x800000) return ~(((x&0x7fffff)<<4)+0x40000000)+1; + if(x>=0x400000) return ~(((x&0x3fffff)<<5)+0x38000000)+1; + if(x>=0x200000) return ~(((x&0x1fffff)<<6)+0x30000000)+1; + if(x>=0x100000) return ~(((x&0xfffff)<<7)+0x28000000)+1; + if(x>=0x80000) return ~(((x&0x7ffff)<<8)+0x20000000)+1; + if(x>=0x40000) return ~(((x&0x3ffff)<<9)+0x18000000)+1; + if(x>=0x20000) return ~(((x&0x1ffff)<<10)+0x10000000)+1; + if(x>=0x10000) return ~(((x&0xffff)<<11)+0x8000000)+1; + return ~(x<<11)+1; + } +} diff -rNu rb/apps/lang/english.lang rb_s80/apps/lang/english.lang --- rb/apps/lang/english.lang 2011-07-29 11:25:21.843750000 +0800 +++ rb_s80/apps/lang/english.lang 2011-08-01 12:36:16.921875000 +0800 @@ -981,6 +981,91 @@ + id: LANG_SPACE80 + desc: in sound settings + user: core + + *: none + swcodec: "Space'80 Reverb" + + + *: none + swcodec: "Space'80 Reverb" + + + *: none + swcodec: "Space'80 Reverb" + + + + id: LANG_SPACE80_DECAY + desc: in space80 settings + user: core + + *: none + swcodec: "Decay" + + + *: none + swcodec: "Decay" + + + *: none + swcodec: "Decay" + + + + id: LANG_SPACE80_FREQ + desc: in space80 settings + user: core + + *: none + swcodec: "Frequency Compensation" + + + *: none + swcodec: "Frequency Compensation" + + + *: none + swcodec: "Frequency Compensation" + + + + id: LANG_SPACE80_GAIN + desc: in space80 settings + user: core + + *: none + swcodec: "Gain" + + + *: none + swcodec: "Gain" + + + *: none + swcodec: "Gain" + + + + id: LANG_SPACE80_MIX + desc: in space80 settings + user: core + + *: none + swcodec: "Dry / Wet Mix" + + + *: none + swcodec: "Dry / Wet Mix" + + + *: none + swcodec: "Dry / Wet Mix" + + + id: LANG_EQUALIZER desc: in the sound settings menu user: core diff -rNu rb/apps/menus/sound_menu.c rb_s80/apps/menus/sound_menu.c --- rb/apps/menus/sound_menu.c 2011-04-17 15:47:08.228573900 +0800 +++ rb_s80/apps/menus/sound_menu.c 2011-08-01 12:36:17.000000000 +0800 @@ -104,6 +104,19 @@ &crossfeed, &crossfeed_direct_gain, &crossfeed_cross_gain, &crossfeed_hf_attenuation, &crossfeed_hf_cutoff); + /* Space'80 Reverb */ + MENUITEM_SETTING(space80, &global_settings.space80, lowlatency_callback); + MENUITEM_SETTING(space80_decay, + &global_settings.space80_decay, lowlatency_callback); + MENUITEM_SETTING(space80_freq, + &global_settings.space80_freq, lowlatency_callback); + MENUITEM_SETTING(space80_gain, + &global_settings.space80_gain, lowlatency_callback); + MENUITEM_SETTING(space80_mix, + &global_settings.space80_mix, lowlatency_callback); + MAKE_MENU(space80_menu,ID2P(LANG_SPACE80), NULL, Icon_NOICON, + &space80, &space80_decay, &space80_freq, &space80_gain, &space80_mix); + #ifdef HAVE_PITCHSCREEN static int timestretch_callback(int action,const struct menu_item_ex *this_item) { @@ -180,7 +193,7 @@ ,&depth_3d #endif #if CONFIG_CODEC == SWCODEC - ,&crossfeed_menu, &equalizer_menu, &dithering_enabled + ,&crossfeed_menu, &space80_menu, &equalizer_menu, &dithering_enabled #ifdef HAVE_PITCHSCREEN ,×tretch_enabled #endif diff -rNu rb/apps/plugin.c rb_s80/apps/plugin.c --- rb/apps/plugin.c 2011-07-11 10:43:44.750000000 +0800 +++ rb_s80/apps/plugin.c 2011-08-01 12:36:17.187500000 +0800 @@ -566,6 +566,7 @@ audio_set_input_source, #endif dsp_set_crossfeed, + dsp_set_space80, dsp_set_eq, dsp_dither_enable, dsp_configure, diff -rNu rb/apps/plugin.h rb_s80/apps/plugin.h --- rb/apps/plugin.h 2011-07-11 10:43:44.781250000 +0800 +++ rb_s80/apps/plugin.h 2011-08-01 12:36:17.218750000 +0800 @@ -653,6 +653,7 @@ void (*audio_set_input_source)(int source, unsigned flags); #endif void (*dsp_set_crossfeed)(bool enable); + void (*dsp_set_space80)(bool enable); void (*dsp_set_eq)(bool enable); void (*dsp_dither_enable)(bool enable); intptr_t (*dsp_configure)(struct dsp_config *dsp, int setting, diff -rNu rb/apps/settings.c rb_s80/apps/settings.c --- rb/apps/settings.c 2011-04-17 15:49:42.276385000 +0800 +++ rb_s80/apps/settings.c 2011-08-01 12:36:17.234375000 +0800 @@ -969,6 +969,11 @@ dsp_set_crossfeed_cross_params(global_settings.crossfeed_cross_gain, global_settings.crossfeed_hf_attenuation, global_settings.crossfeed_hf_cutoff); + dsp_set_space80(global_settings.space80); + dsp_set_space80_params(global_settings.space80_decay, + global_settings.space80_freq, + global_settings.space80_gain, + global_settings.space80_mix); /* Configure software equalizer, hardware eq is handled in audio_init() */ dsp_set_eq(global_settings.eq_enabled); diff -rNu rb/apps/settings.h rb_s80/apps/settings.h --- rb/apps/settings.h 2011-06-07 07:59:48.765625000 +0800 +++ rb_s80/apps/settings.h 2011-08-01 12:36:17.265625000 +0800 @@ -333,6 +333,13 @@ unsigned int crossfeed_hf_attenuation; /* dB x 10 */ unsigned int crossfeed_hf_cutoff; /* Frequency in Hz */ + /* Space'80 Reverb */ + bool space80; + unsigned int space80_decay; + unsigned int space80_freq; + unsigned int space80_gain; + unsigned int space80_mix; + /* EQ */ bool eq_enabled; /* Enable equalizer */ unsigned int eq_precut; /* dB */ diff -rNu rb/apps/settings_list.c rb_s80/apps/settings_list.c --- rb/apps/settings_list.c 2011-07-21 13:26:16.609375000 +0800 +++ rb_s80/apps/settings_list.c 2011-08-01 12:36:17.375000000 +0800 @@ -382,6 +382,15 @@ global_settings.crossfeed_hf_cutoff); } +static void space80_set(int val) +{ + (void)val; + dsp_set_space80_params(global_settings.space80_decay, + global_settings.space80_freq, + global_settings.space80_gain, + global_settings.space80_mix); +} + static void compressor_set(int val) { (void)val; @@ -1352,6 +1361,26 @@ "crossfeed hf cutoff", UNIT_HERTZ, 500, 2000, 100, NULL, NULL, crossfeed_cross_set), + /* space80 */ + OFFON_SETTING(F_SOUNDSETTING, space80, LANG_SPACE80, false, + "space80", dsp_set_space80), + INT_SETTING_NOWRAP(F_SOUNDSETTING, space80_decay, + LANG_SPACE80_DECAY, 40, + "space80 decay", UNIT_PERCENT, 0, 100, + 5, NULL, NULL, space80_set), + INT_SETTING_NOWRAP(F_SOUNDSETTING, space80_freq, + LANG_SPACE80_FREQ, 25, + "space80 freq", UNIT_PERCENT, 0, 100, + 5, NULL, NULL, space80_set), + INT_SETTING_NOWRAP(F_SOUNDSETTING, space80_gain, + LANG_SPACE80_GAIN, 50, + "space80 gain", UNIT_PERCENT, 0, 100, + 5, NULL, NULL, space80_set), + INT_SETTING_NOWRAP(F_SOUNDSETTING, space80_mix, + LANG_SPACE80_MIX, 40, + "space80 mix", UNIT_PERCENT, 0, 100, + 5, NULL, NULL, space80_set), + /* equalizer */ OFFON_SETTING(F_EQSETTING, eq_enabled, LANG_EQUALIZER_ENABLED, false, "eq enabled", NULL),