mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 16:08:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

audio: const gpointer is not the same as gconstpointer/const void *

Browse source 
See https://bugzilla.gnome.org/show_bug.cgi?id=664491
This commit is contained in:
Sebastian Dröge 2018-11-04 21:17:28 +02:00 committed by Sebastian Dröge
parent e466226d46
commit d3a35870a2
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst-libs/gst/audio/audio-format.c
View file

@ -112,14 +112,14 @@
#define MAKE_ORC_PACK_UNPACK(fmt,fmt_t) \ #define MAKE_ORC_PACK_UNPACK(fmt,fmt_t) \
static void unpack_ ##fmt (const GstAudioFormatInfo *info, \ static void unpack_ ##fmt (const GstAudioFormatInfo *info, \
GstAudioPackFlags flags, gpointer dest, \ GstAudioPackFlags flags, gpointer dest, \
const gpointer data, gint length) { \ gconstpointer data, gint length) { \
if (flags & GST_AUDIO_PACK_FLAG_TRUNCATE_RANGE) \ if (flags & GST_AUDIO_PACK_FLAG_TRUNCATE_RANGE) \
audio_orc_unpack_ ##fmt_t (dest, data, length); \ audio_orc_unpack_ ##fmt_t (dest, data, length); \
else \ else \
audio_orc_unpack_ ##fmt (dest, data, length); \ audio_orc_unpack_ ##fmt (dest, data, length); \
} \ } \
static void pack_ ##fmt (const GstAudioFormatInfo *info, \ static void pack_ ##fmt (const GstAudioFormatInfo *info, \
GstAudioPackFlags flags, const gpointer src, \ GstAudioPackFlags flags, gconstpointer src, \
gpointer data, gint length) { \ gpointer data, gint length) { \
audio_orc_pack_ ##fmt (data, src, length); \ audio_orc_pack_ ##fmt (data, src, length); \
} }
@ -161,21 +161,21 @@ MAKE_ORC_PACK_UNPACK (s8, s8_trunc)
#define MAKE_PACK_UNPACK(name, stride, sign, scale, READ_FUNC, WRITE_FUNC) \ #define MAKE_PACK_UNPACK(name, stride, sign, scale, READ_FUNC, WRITE_FUNC) \
static void unpack_ ##name (const GstAudioFormatInfo *info, \ static void unpack_ ##name (const GstAudioFormatInfo *info, \
GstAudioPackFlags flags, gpointer dest, \ GstAudioPackFlags flags, gpointer dest, \
const gpointer data, gint length) \ gconstpointer data, gint length) \
{ \ { \
guint32 *d = dest; \ guint32 *d = dest; \
guint8 *s = data; \ const guint8 *s = data; \
for (;length; length--) { \ for (;length; length--) { \
*d++ = (((gint32) READ_FUNC (s)) << scale) ^ (sign); \ *d++ = (((gint32) READ_FUNC (s)) << scale) ^ (sign); \
s += stride; \ s += stride; \
} \ } \
} \ } \
static void pack_ ##name (const GstAudioFormatInfo *info, \ static void pack_ ##name (const GstAudioFormatInfo *info, \
GstAudioPackFlags flags, const gpointer src, \ GstAudioPackFlags flags, gconstpointer src, \
gpointer data, gint length) \ gpointer data, gint length) \
{ \ { \
gint32 tmp; \ gint32 tmp; \
guint32 *s = src; \ const guint32 *s = src; \
guint8 *d = data; \ guint8 *d = data; \
for (;length; length--) { \ for (;length; length--) { \
tmp = (*s++ ^ (sign)) >> scale; \ tmp = (*s++ ^ (sign)) >> scale; \

4
gst-libs/gst/audio/audio-format.h
View file

@ -200,7 +200,7 @@ typedef enum
*/ */
typedef void (*GstAudioFormatUnpack) (const GstAudioFormatInfo *info, typedef void (*GstAudioFormatUnpack) (const GstAudioFormatInfo *info,
GstAudioPackFlags flags, gpointer dest, GstAudioPackFlags flags, gpointer dest,
const gpointer data, gint length); gconstpointer data, gint length);
/** /**
* GstAudioFormatPack: * GstAudioFormatPack:
* @info: a #GstAudioFormatInfo * @info: a #GstAudioFormatInfo
@ -215,7 +215,7 @@ typedef void (*GstAudioFormatUnpack) (const GstAudioFormatInfo *info,
* and will be packed into @data. * and will be packed into @data.
*/ */
typedef void (*GstAudioFormatPack) (const GstAudioFormatInfo *info, typedef void (*GstAudioFormatPack) (const GstAudioFormatInfo *info,
GstAudioPackFlags flags, const gpointer src, GstAudioPackFlags flags, gconstpointer src,
gpointer data, gint length); gpointer data, gint length);
/** /**