fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Avoid undefined shifts in SATURATE_SHIFT" 

This reverts commit 3a831a5fbc.

This local fix doesn't seem to be needed any more after the latest
upstream update.
This commit is contained in:
Martin Storsjo 2020-11-17 12:51:21 +02:00
parent 559379e08b
commit ea21799a7b
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libFDK/include/scale.h
View File

@ -239,31 +239,20 @@ inline void scaleValueInPlace(FIXP_DBL *value, /*!< Value */
#ifndef SATURATE_RIGHT_SHIFT #ifndef SATURATE_RIGHT_SHIFT
#define SATURATE_RIGHT_SHIFT(src, scale, dBits) \ #define SATURATE_RIGHT_SHIFT(src, scale, dBits) \
(((scale) >= 8*sizeof(LONG)) ? (LONG)0 : \
((((LONG)(src) >> (scale)) > (LONG)(((1U) << ((dBits)-1)) - 1)) \ ((((LONG)(src) >> (scale)) > (LONG)(((1U) << ((dBits)-1)) - 1)) \
? (LONG)(((1U) << ((dBits)-1)) - 1) \ ? (LONG)(((1U) << ((dBits)-1)) - 1) \
: (((LONG)(src) >> (scale)) < ~((LONG)(((1U) << ((dBits)-1)) - 1))) \ : (((LONG)(src) >> (scale)) < ~((LONG)(((1U) << ((dBits)-1)) - 1))) \
? ~((LONG)(((1U) << ((dBits)-1)) - 1)) \ ? ~((LONG)(((1U) << ((dBits)-1)) - 1)) \
: ((LONG)(src) >> (scale)))) : ((LONG)(src) >> (scale)))
#endif
#ifndef SATURATE_LEFT_MAX
#define SATURATE_LEFT_MAX(src, dBits) \
(((LONG)(src) > 0) \
? (LONG)(((1U) << ((dBits)-1)) - 1) \
: ((LONG)(src) < 0) \
? ~((LONG)(((1U) << ((dBits)-1)) - 1)) \
: (LONG)0)
#endif #endif
#ifndef SATURATE_LEFT_SHIFT #ifndef SATURATE_LEFT_SHIFT
#define SATURATE_LEFT_SHIFT(src, scale, dBits) \ #define SATURATE_LEFT_SHIFT(src, scale, dBits) \
(((scale) >= 8*sizeof(LONG)) ? SATURATE_LEFT_MAX(src, dBits) : \
(((LONG)(src) > ((LONG)(((1U) << ((dBits)-1)) - 1) >> (scale))) \ (((LONG)(src) > ((LONG)(((1U) << ((dBits)-1)) - 1) >> (scale))) \
? (LONG)(((1U) << ((dBits)-1)) - 1) \ ? (LONG)(((1U) << ((dBits)-1)) - 1) \
: ((LONG)(src) < ~((LONG)(((1U) << ((dBits)-1)) - 1) >> (scale))) \ : ((LONG)(src) < ~((LONG)(((1U) << ((dBits)-1)) - 1) >> (scale))) \
? ~((LONG)(((1U) << ((dBits)-1)) - 1)) \ ? ~((LONG)(((1U) << ((dBits)-1)) - 1)) \
: ((LONG)(src) << (scale)))) : ((LONG)(src) << (scale)))
#endif #endif
#ifndef SATURATE_SHIFT #ifndef SATURATE_SHIFT