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

adder: add variants for unsigned to fix warnings for unneeded check

Browse source 
For unsigned int out+in can't be < 0.
This commit is contained in:
Stefan Kost 2009-03-05 12:27:16 +02:00
parent 2723c7e4f3
commit 79771eaba7
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gst/adder/gstadder.c
View file

@ -152,14 +152,28 @@ gst_adder_get_type (void)
return adder_type; return adder_type;
} }
/* clipping versions /* clipping versions (for int)
* FIXME: what about: oil_add_s16 (out, out, in, bytes / sizeof (type)) * FIXME: what about: oil_add_s16 (out, out, in, bytes / sizeof (type))
*/ */
#define MAKE_FUNC(name,type,ttype,min,max) \ #define MAKE_FUNC(name,type,ttype,min,max) \
static void name (type *out, type *in, gint bytes) { \ static void name (type *out, type *in, gint bytes) { \
gint i; \ gint i; \
for (i = 0; i < bytes / sizeof (type); i++) \ ttype add; \
out[i] = CLAMP ((ttype)out[i] + (ttype)in[i], min, max); \ for (i = 0; i < bytes / sizeof (type); i++) { \
add = (ttype)out[i] + (ttype)in[i]; \
out[i] = CLAMP (add, min, max); \
} \
}
/* unsigned versions (for int) */
#define MAKE_FUNC_US(name,type,ttype,max) \
static void name (type *out, type *in, gint bytes) { \
gint i; \
ttype add; \
for (i = 0; i < bytes / sizeof (type); i++) { \
add = (ttype)out[i] + (ttype)in[i]; \
out[i] = ((add <= max) ? add : max); \
} \
} }
/* non-clipping versions (for float) */ /* non-clipping versions (for float) */
@ -171,7 +185,7 @@ static void name (type *out, type *in, gint bytes) { \
} }
#if 0 #if 0
/* right now, the liboil function don't seems to be faster /* right now, the liboil function don't seems to be faster on x86
* time gst-launch audiotestsrc num-buffers=50000 ! audio/x-raw-float ! adder name=m ! fakesink audiotestsrc num-buffers=50000 ! audio/x-raw-float ! m. * time gst-launch audiotestsrc num-buffers=50000 ! audio/x-raw-float ! adder name=m ! fakesink audiotestsrc num-buffers=50000 ! audio/x-raw-float ! m.
* time gst-launch audiotestsrc num-buffers=50000 ! audio/x-raw-float,width=32 ! adder name=m ! fakesink audiotestsrc num-buffers=50000 ! audio/x-raw-float,width=32 ! m. * time gst-launch audiotestsrc num-buffers=50000 ! audio/x-raw-float,width=32 ! adder name=m ! fakesink audiotestsrc num-buffers=50000 ! audio/x-raw-float,width=32 ! m.
*/ */
@ -192,9 +206,9 @@ add_float64 (gdouble * out, gdouble * in, gint bytes)
MAKE_FUNC (add_int32, gint32, gint64, MIN_INT_32, MAX_INT_32) MAKE_FUNC (add_int32, gint32, gint64, MIN_INT_32, MAX_INT_32)
MAKE_FUNC (add_int16, gint16, gint32, MIN_INT_16, MAX_INT_16) MAKE_FUNC (add_int16, gint16, gint32, MIN_INT_16, MAX_INT_16)
MAKE_FUNC (add_int8, gint8, gint16, MIN_INT_8, MAX_INT_8) MAKE_FUNC (add_int8, gint8, gint16, MIN_INT_8, MAX_INT_8)
MAKE_FUNC (add_uint32, guint32, guint64, MIN_UINT_32, MAX_UINT_32) MAKE_FUNC_US (add_uint32, guint32, guint64, MAX_UINT_32)
MAKE_FUNC (add_uint16, guint16, guint32, MIN_UINT_16, MAX_UINT_16) MAKE_FUNC_US (add_uint16, guint16, guint32, MAX_UINT_16)
MAKE_FUNC (add_uint8, guint8, guint16, MIN_UINT_8, MAX_UINT_8) MAKE_FUNC_US (add_uint8, guint8, guint16, MAX_UINT_8)
MAKE_FUNC_NC (add_float64, gdouble) MAKE_FUNC_NC (add_float64, gdouble)
MAKE_FUNC_NC (add_float32, gfloat) MAKE_FUNC_NC (add_float32, gfloat)
/* *INDENT-ON* */ /* *INDENT-ON* */