diff --git a/lookahead_limiter_1435.xml b/lookahead_limiter_1435.xml deleted file mode 100644 index fa3fbed..0000000 --- a/lookahead_limiter_1435.xml +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - #include "ladspa-util.h" - #include "util/db.h" - - /* Minimum buffer size in seconds */ - #define BUFFER_TIME 2 - - - - - Lookahead limiter - - - - - - fabs(in_2[pos]) ? fabs(in_1[pos]) : - fabs(in_2[pos]); - //sig = lin2db(sig) - limit; - sig = CO_DB(sig) - limit; - - if (sig > 0.0f && sig / (float)delay > peak / (float)peak_dist) { - peak_dist = delay; - peak = sig; - } - - /* Incremenatlly approach the correct attenuation for the next peak */ - atten -= (atten - peak) / (float)(peak_dist + 1); - - if (peak_dist-- == 0) { - peak_dist = delay; - peak = 0.0f; - } - - gain = 1.0f / db2lin(atten); - buffer_write(out_1[pos], buffer[(buffer_pos * 2 - delay * 2) & - (buffer_len - 1)] * gain); - buffer_write(out_2[pos], buffer[(buffer_pos * 2 - delay * 2 + 1) & - (buffer_len - 1)] * gain); - - /* Ensure that the signal really can't be over the limit, potentially - * changes in the lookahead time could cause us to miss peaks */ - -#if 0 -XXX FIXME XXX - if (out_1[pos] < -max) { - buffer_write(out_1[pos], -max); - } else if (out_1[pos] > max) { - buffer_write(out_1[pos], max); - } - if (out_2[pos] < -max) { - buffer_write(out_2[pos], -max); - } else if (out_2[pos] > max) { - buffer_write(out_2[pos], max); - } -#endif - - buffer_pos++; - } - - plugin_data->buffer_pos = buffer_pos; - plugin_data->peak = peak; - plugin_data->peak_dist = peak_dist; - plugin_data->atten = atten; - - *(plugin_data->attenuation) = atten; - *(plugin_data->latency) = delay; - ]]> - - buffer); - ]]> - - - Limit (dB) -

The maximum output amplitude. Peaks over this level will be attenuated as smoothly as possible to bring them as close as possible to this level.

- -
- - - Lookahead delay -

The delay used by the lookahead predictor. The longer the delay the smoother the limiting will be, but higher the latency.

- -
- - - Attenuation (dB) -

The current attenuation of the signal coming out of the delay buffer.

- -
- - - Input 1 - - - - Input 2 - - - - Output 1 - - - - Output 2 - - - - latency - - - - - - - - - - - - -
-
diff --git a/lookahead_limiter_const_1906.xml b/lookahead_limiter_const_1906.xml deleted file mode 100644 index 95d6356..0000000 --- a/lookahead_limiter_const_1906.xml +++ /dev/null @@ -1,204 +0,0 @@ - - - - - - - - - - - #include "ladspa-util.h" - #include "util/db.h" - - /* Minimum buffer size in seconds */ - #define BUFFER_TIME 0.15f - - - - - Lookahead limiter (fixed latency) -

A lookahead limiter - similar to the original Lookahead Limiter, but -with a constant latency of around 150ms and a reduced maximum lookahead -time.

- - - - - - b ? a : b; -/* XXX - sig = fabs(in_1[pos]) > fabs(in_2[pos]) ? fabs(in_1[pos]) : - fabs(in_2[pos]); -*/ - - if (sig > max) { - const float rel = lin2db(sig) - limit; - - if (rel / delay > peak / (float)peak_dist) { - peak_dist = delay; - peak = rel; - } - } - - /* Incremenatlly approach the correct attenuation for the next peak */ - atten -= (atten - peak) / (float)(peak_dist + 1); - - if (peak_dist-- == 0) { - peak_dist = f_round(delay); - peak = 0.0f; - } - - /* Cacluate the apropriate gain reduction and write it back into the - * buffer */ - gain = amp_buffer[(buffer_pos - f_round(delay)) & (buffer_len - 1)]; - amp_buffer[(buffer_pos - f_round(delay)) & (buffer_len - 1)] = - 1.0f / db2lin(atten); - -gain=1.0f / db2lin(atten); - - buffer_write(out_1[pos], buffer[(2 * (buffer_pos + 1)) & - buffer_mask] * gain); - buffer_write(out_2[pos], buffer[(2 * (buffer_pos + 1)+1) & - buffer_mask] * gain); - - /* Ensure that the signal really can't be over the limit */ - -#if 0 -XXX FIXME XXX - if (out_1[pos] < -max) { - buffer_write(out_1[pos], -max); - } else if (out_1[pos] > max) { - buffer_write(out_1[pos], max); - } - if (out_2[pos] < -max) { - buffer_write(out_2[pos], -max); - } else if (out_2[pos] > max) { - buffer_write(out_2[pos], max); - } -#endif - - buffer_pos++; - } - - plugin_data->buffer_pos = buffer_pos; - plugin_data->peak = peak; - plugin_data->peak_dist = peak_dist; - plugin_data->atten = atten; - plugin_data->last_delay = delay; - - *(plugin_data->attenuation) = atten; - *(plugin_data->latency) = buffer_len - 1; - ]]> - - buffer); - free(plugin_data->amp_buffer); - ]]> - - - Limit (dB) -

The maximum output amplitude. Peaks over this level will be attenuated as smoothly as possible to bring them as close as possible to this level.

- -
- - - Lookahead time (s) -

The delay time used by the lookahead predictor. The longer the time the smoother the limiting will be, but will tend to make the changes in dynamic range more obvious.

- -
- - - Attenuation (dB) -

The current limiting attenuation of the signal coming out of the delay -buffer.

- -
- - - Input 1 - - - - Input 2 - - - - Output 1 - - - - Output 2 - - - - latency - - - - - - - - - - - - - - - -
-
diff --git a/metadata/swh-plugins.rdf b/metadata/swh-plugins.rdf index 1f59163..eac4bf9 100644 --- a/metadata/swh-plugins.rdf +++ b/metadata/swh-plugins.rdf @@ -2629,68 +2629,6 @@ - - Steve Harris <steve@plugin.org.uk> - Lookahead limiter - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Steve Harris <steve@plugin.org.uk> - Lookahead limiter (fixed latency) - - - - - - - - - - - - - - - - - - - - - - - - - - - - Alexander Ehlert <mag@glame.de> Glame Lowpass Filter diff --git a/po/de.po b/po/de.po index 147e60b..bd16bc0 100644 --- a/po/de.po +++ b/po/de.po @@ -181,11 +181,11 @@ msgstr "Feedback" msgid "Comb Splitter" msgstr "Kammspalter" -#: comb_splitter_1411.xml:133 lookahead_limiter_1435.xml:200 split_1406.xml:82 +#: comb_splitter_1411.xml:133 split_1406.xml:82 msgid "Output 1" msgstr "Ausgang 1" -#: comb_splitter_1411.xml:140 lookahead_limiter_1435.xml:207 split_1406.xml:92 +#: comb_splitter_1411.xml:140 split_1406.xml:92 msgid "Output 2" msgstr "Ausgang 2" @@ -1013,27 +1013,11 @@ msgstr "L-Ausgang" msgid "R output" msgstr "R-Ausgang" -#: lookahead_limiter_1435.xml:131 -msgid "Lookahead limiter" -msgstr "Vorgriff-Begrenzer" - -#: lookahead_limiter_1435.xml:156 -msgid "Limit (dB)" -msgstr "Begrenzung (dB)" - -#: lookahead_limiter_1435.xml:166 -msgid "Lookahead delay" -msgstr "Vorgriff-Verzögerung" - -#: lookahead_limiter_1435.xml:176 -msgid "Attenuation (dB)" -msgstr "Dämpfung (dB)" - -#: lookahead_limiter_1435.xml:186 step_muxer_1212.xml:166 +#: step_muxer_1212.xml:166 msgid "Input 1" msgstr "Eingang 1" -#: lookahead_limiter_1435.xml:193 step_muxer_1212.xml:173 +#: step_muxer_1212.xml:173 msgid "Input 2" msgstr "Eingang 2" diff --git a/po/en_GB.po b/po/en_GB.po index 43a4fe5..99eb7fd 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -177,11 +177,11 @@ msgstr "" msgid "Comb Splitter" msgstr "" -#: comb_splitter_1411.xml:133 lookahead_limiter_1435.xml:200 split_1406.xml:82 +#: comb_splitter_1411.xml:133 split_1406.xml:82 msgid "Output 1" msgstr "" -#: comb_splitter_1411.xml:140 lookahead_limiter_1435.xml:207 split_1406.xml:92 +#: comb_splitter_1411.xml:140 split_1406.xml:92 msgid "Output 2" msgstr "" @@ -1001,27 +1001,11 @@ msgstr "" msgid "R output" msgstr "" -#: lookahead_limiter_1435.xml:131 -msgid "Lookahead limiter" -msgstr "" - -#: lookahead_limiter_1435.xml:156 -msgid "Limit (dB)" -msgstr "" - -#: lookahead_limiter_1435.xml:166 -msgid "Lookahead delay" -msgstr "" - -#: lookahead_limiter_1435.xml:176 -msgid "Attenuation (dB)" -msgstr "" - -#: lookahead_limiter_1435.xml:186 step_muxer_1212.xml:166 +#: step_muxer_1212.xml:166 msgid "Input 1" msgstr "" -#: lookahead_limiter_1435.xml:193 step_muxer_1212.xml:173 +#: step_muxer_1212.xml:173 msgid "Input 2" msgstr "" diff --git a/po/swh-plugins.pot b/po/swh-plugins.pot index 811b390..bde1300 100644 --- a/po/swh-plugins.pot +++ b/po/swh-plugins.pot @@ -177,11 +177,11 @@ msgstr "" msgid "Comb Splitter" msgstr "" -#: comb_splitter_1411.xml:133 lookahead_limiter_1435.xml:200 split_1406.xml:82 +#: comb_splitter_1411.xml:133 split_1406.xml:82 msgid "Output 1" msgstr "" -#: comb_splitter_1411.xml:140 lookahead_limiter_1435.xml:207 split_1406.xml:92 +#: comb_splitter_1411.xml:140 split_1406.xml:92 msgid "Output 2" msgstr "" @@ -1001,27 +1001,11 @@ msgstr "" msgid "R output" msgstr "" -#: lookahead_limiter_1435.xml:131 -msgid "Lookahead limiter" -msgstr "" - -#: lookahead_limiter_1435.xml:156 -msgid "Limit (dB)" -msgstr "" - -#: lookahead_limiter_1435.xml:166 -msgid "Lookahead delay" -msgstr "" - -#: lookahead_limiter_1435.xml:176 -msgid "Attenuation (dB)" -msgstr "" - -#: lookahead_limiter_1435.xml:186 step_muxer_1212.xml:166 +#: step_muxer_1212.xml:166 msgid "Input 1" msgstr "" -#: lookahead_limiter_1435.xml:193 step_muxer_1212.xml:173 +#: step_muxer_1212.xml:173 msgid "Input 2" msgstr ""