mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

audioecho: Micro-optimize

Browse source 
Gives 1.28x speedup in surround-delay=false mode
This commit is contained in:
Sebastian Dröge 2017-10-07 01:21:19 +03:00
parent ad062e1879
commit 7d80fa4bbf
1 changed files with 57 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
gst/audiofx/audioecho.c
View file

@ -385,37 +385,66 @@ gst_audio_echo_transform_##name (GstAudioEcho * self, \
guint channels = GST_AUDIO_FILTER_CHANNELS (self); \ guint channels = GST_AUDIO_FILTER_CHANNELS (self); \
guint i, j; \ guint i, j; \
guint echo_offset = self->buffer_size_frames - self->delay_frames; \ guint echo_offset = self->buffer_size_frames - self->delay_frames; \
gdouble intensity = self->intensity; \
gdouble feedback = self->feedback; \
guint buffer_pos = self->buffer_pos; \
guint buffer_size_frames = self->buffer_size_frames; \
\ \
num_samples /= channels; \ if (self->surdelay == FALSE) { \
\ guint read_pos = ((echo_offset + buffer_pos) % buffer_size_frames) * channels; \
for (i = 0; i < num_samples; i++) { \ guint write_pos = (buffer_pos % buffer_size_frames) * channels; \
guint echo_index = ((echo_offset + self->buffer_pos) % self->buffer_size_frames) * channels; \ guint buffer_size = buffer_size_frames * channels; \
guint rbout_index = (self->buffer_pos % self->buffer_size_frames) * channels; \ for (i = 0; i < num_samples; i++) { \
guint64 channel_mask = 1; \ gdouble in = *data; \
for (j = 0; j < channels; j++) { \ gdouble echo = buffer[read_pos]; \
if (self->surdelay == FALSE) { \ type out = in + intensity * echo; \
gdouble in = data[i*channels + j]; \ \
gdouble echo = buffer[echo_index + j]; \ *data = out; \
type out = in + self->intensity * echo; \ \
\ buffer[write_pos] = in + feedback * echo; \
GST_DEBUG ( "not adding delay on Surround Channel %d", j); \ read_pos = (read_pos + 1) % buffer_size; \
data[i*channels + j] = out; \ write_pos = (write_pos + 1) % buffer_size; \
\ data++; \
buffer[rbout_index + j] = in + self->feedback * echo; \
} else if (channel_mask & self->surround_mask) { \
gdouble in = data[i*channels + j]; \
gdouble echo = buffer[echo_index + j]; \
type out = echo; \
GST_DEBUG ( "Adding delay on Surround Channel %d", j); \
\
data[i*channels + j] = out; \
\
buffer[rbout_index + j] = in; \
} \
channel_mask <<= 1; \
} \ } \
self->buffer_pos = (self->buffer_pos + 1) % self->buffer_size_frames; \ buffer_pos = write_pos / channels; \
} else { \
guint64 surround_mask = self->surround_mask; \
guint read_pos = ((echo_offset + buffer_pos) % buffer_size_frames) * channels; \
guint write_pos = (buffer_pos % buffer_size_frames) * channels; \
guint buffer_size = buffer_size_frames * channels; \
\
num_samples /= channels; \
\
for (i = 0; i < num_samples; i++) { \
guint64 channel_mask = 1; \
\
for (j = 0; j < channels; j++) { \
if (channel_mask & surround_mask) { \
gdouble in = data[j]; \
gdouble echo = buffer[read_pos + j]; \
type out = echo; \
\
data[j] = out; \
\
buffer[write_pos + j] = in; \
} else { \
gdouble in = data[j]; \
gdouble echo = buffer[read_pos + j]; \
type out = in + intensity * echo; \
\
data[j] = out; \
\
buffer[write_pos + j] = in + feedback * echo; \
} \
channel_mask <<= 1; \
} \
read_pos = (read_pos + channels) % buffer_size; \
write_pos = (write_pos + channels) % buffer_size; \
data += channels; \
} \
buffer_pos = write_pos / channels; \
} \ } \
self->buffer_pos = buffer_pos; \
} }
TRANSFORM_FUNC (float, gfloat); TRANSFORM_FUNC (float, gfloat);