mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

audio-resampler: small cleanups

Browse source
This commit is contained in:
Wim Taymans 2016-01-22 10:28:13 +01:00
parent 85c77659b9
commit 4e48867097
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/audio/audio-converter.c
View file

@ -397,7 +397,7 @@ get_temp_samples (AudioChain * chain, gsize num_samples, gpointer user_data)
gsize stride = GST_ROUND_UP_N (num_samples * chain->stride, ALIGN); gsize stride = GST_ROUND_UP_N (num_samples * chain->stride, ALIGN);
/* first part contains the pointers, second part the data, add some extra bytes /* first part contains the pointers, second part the data, add some extra bytes
* for alignement */ * for alignement */
gsize needed = (stride + sizeof (gpointer)) * chain->blocks + ALIGN; gsize needed = (stride + sizeof (gpointer)) * chain->blocks + ALIGN - 1;
GST_DEBUG ("alloc samples %d %" G_GSIZE_FORMAT " %" G_GSIZE_FORMAT, GST_DEBUG ("alloc samples %d %" G_GSIZE_FORMAT " %" G_GSIZE_FORMAT,
chain->stride, num_samples, needed); chain->stride, num_samples, needed);

19
gst-libs/gst/audio/audio-resampler.c
View file

@ -47,6 +47,8 @@ typedef void (*DeinterleaveFunc) (GstAudioResampler * resampler,
gpointer * sbuf, gpointer in[], gsize in_frames); gpointer * sbuf, gpointer in[], gsize in_frames);
#define MEM_ALIGN(m,a) ((gint8 *)((guintptr)((gint8 *)(m) + ((a)-1)) & ~((a)-1))) #define MEM_ALIGN(m,a) ((gint8 *)((guintptr)((gint8 *)(m) + ((a)-1)) & ~((a)-1)))
#define ALIGN 16
#define TAPS_OVERREAD 16
struct _GstAudioResampler struct _GstAudioResampler
{ {
@ -671,10 +673,10 @@ resampler_calculate_taps (GstAudioResampler * resampler)
resampler->taps = g_realloc_n (resampler->taps, out_rate, sizeof (Tap)); resampler->taps = g_realloc_n (resampler->taps, out_rate, sizeof (Tap));
resampler->cstride = GST_ROUND_UP_32 (bps * (n_taps + 16)); resampler->cstride = GST_ROUND_UP_32 (bps * (n_taps + TAPS_OVERREAD));
g_free (resampler->coeffmem); g_free (resampler->coeffmem);
resampler->coeffmem = g_malloc0 (out_rate * resampler->cstride + 31); resampler->coeffmem = g_malloc0 (out_rate * resampler->cstride + ALIGN - 1);
resampler->coeff = MEM_ALIGN (resampler->coeffmem, 32); resampler->coeff = MEM_ALIGN (resampler->coeffmem, ALIGN);
resampler->tmpcoeff = resampler->tmpcoeff =
g_realloc_n (resampler->tmpcoeff, n_taps, sizeof (gdouble)); g_realloc_n (resampler->tmpcoeff, n_taps, sizeof (gdouble));
@ -1065,22 +1067,19 @@ get_sample_bufs (GstAudioResampler * resampler, gsize need)
{ {
if (G_LIKELY (resampler->samples_len < need)) { if (G_LIKELY (resampler->samples_len < need)) {
guint c, blocks = resampler->blocks; guint c, blocks = resampler->blocks;
gsize bytes, bpf; gsize bytes;
gint8 *ptr; gint8 *ptr;
GST_LOG ("realloc %d -> %d", (gint) resampler->samples_len, (gint) need); GST_LOG ("realloc %d -> %d", (gint) resampler->samples_len, (gint) need);
bpf = resampler->bps * resampler->inc; bytes = GST_ROUND_UP_N (need * resampler->bps * resampler->inc, ALIGN);
bytes = (need + 8) * bpf;
bytes = GST_ROUND_UP_32 (bytes);
/* FIXME, move history */ /* FIXME, move history */
resampler->samples = resampler->samples =
g_realloc (resampler->samples, resampler->blocks * bytes + 31); g_realloc (resampler->samples, resampler->blocks * bytes + ALIGN - 1);
resampler->samples_len = need; resampler->samples_len = need;
ptr = MEM_ALIGN (resampler->samples, 32); ptr = MEM_ALIGN (resampler->samples, ALIGN);
/* set up new pointers */ /* set up new pointers */
for (c = 0; c < blocks; c++) { for (c = 0; c < blocks; c++) {