mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:28:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

audio-converter: ensure correct alignment of samples

Browse source 
Make sure that the data we allocate for our temporary buffers is
properly aligned.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=760938
This commit is contained in:
Wim Taymans 2016-01-21 16:08:46 +01:00
parent c99caa6b37
commit 3674742957
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -161,7 +161,7 @@ struct _AudioChain
gpointer alloc_data; gpointer alloc_data;
gpointer *tmp; gpointer *tmp;
gsize tmpsize; gsize allocated_samples;
gpointer *samples; gpointer *samples;
gsize num_samples; gsize num_samples;
@ -365,28 +365,30 @@ get_output_samples (AudioChain * chain, gsize num_samples, gpointer user_data)
return convert->out_data; return convert->out_data;
} }
#define MEM_ALIGN(m,a) ((gint8 *)((guintptr)((gint8 *)(m) + ((a)-1)) & ~((a)-1)))
#define ALIGN 16
static gpointer * static gpointer *
get_temp_samples (AudioChain * chain, gsize num_samples, gpointer user_data) get_temp_samples (AudioChain * chain, gsize num_samples, gpointer user_data)
{ {
gsize needed; if (num_samples > chain->allocated_samples) {
/* first part contains the pointers, second part the data */
needed = (num_samples * chain->stride + sizeof (gpointer)) * chain->blocks;
if (needed > chain->tmpsize) {
gint i; gint i;
guint8 *s; gint8 *s;
gsize stride = GST_ROUND_UP_N (num_samples * chain->stride, ALIGN);
/* first part contains the pointers, second part the data, add some extra bytes
* for alignement */
gsize needed = (stride + sizeof (gpointer)) * chain->blocks + ALIGN;
GST_DEBUG ("alloc samples %" G_GSIZE_FORMAT, needed); GST_DEBUG ("alloc samples %" G_GSIZE_FORMAT, needed);
chain->tmp = g_realloc (chain->tmp, needed); chain->tmp = g_realloc (chain->tmp, needed);
chain->tmpsize = needed; chain->allocated_samples = num_samples;
/* jump to the data */ /* pointer to the data, make sure it's 16 bytes aligned */
s = (guint8 *) & chain->tmp[chain->blocks]; s = MEM_ALIGN (&chain->tmp[chain->blocks], ALIGN);
/* set up the pointers */ /* set up the pointers */
for (i = 0; i < chain->blocks; i++) for (i = 0; i < chain->blocks; i++)
chain->tmp[i] = s + (i * num_samples * chain->stride); chain->tmp[i] = s + i * stride;
} }
GST_LOG ("temp samples %p %" G_GSIZE_FORMAT, chain->tmp, num_samples); GST_LOG ("temp samples %p %" G_GSIZE_FORMAT, chain->tmp, num_samples);