diff options
| author | Marco Nelissen <marcone@google.com> | 2015-10-16 20:32:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-16 20:32:36 +0000 |
| commit | 94b511ec304400f2a9e9016f87a9b56e19320a7b (patch) | |
| tree | d6e4b61c2d1870cb36272518d803c1a054cd77e1 | |
| parent | 5ba732ea7db0d13376160f54fed3b0ee0b64422e (diff) | |
| parent | f85f2e5a77a578fc14bf95fa05025add350e7f9e (diff) | |
| download | android_external_libmpeg2-94b511ec304400f2a9e9016f87a9b56e19320a7b.tar.gz android_external_libmpeg2-94b511ec304400f2a9e9016f87a9b56e19320a7b.tar.bz2 android_external_libmpeg2-94b511ec304400f2a9e9016f87a9b56e19320a7b.zip | |
Merge "fix CLIP_S16" into mnc-dr-dev
| -rw-r--r-- | common/armv8/impeg2_platform_macros.h | 2 | ||||
| -rw-r--r-- | common/mips/impeg2_platform_macros.h | 2 | ||||
| -rw-r--r-- | common/x86/impeg2_platform_macros.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/common/armv8/impeg2_platform_macros.h b/common/armv8/impeg2_platform_macros.h index ff31034..be1f8d8 100644 --- a/common/armv8/impeg2_platform_macros.h +++ b/common/armv8/impeg2_platform_macros.h @@ -41,7 +41,7 @@ static __inline UWORD32 CLZ(UWORD32 u4_word) #define CLIP_S12(x) ((x) > 2047) ? (2047) : (((x) < -2048) ? (-2048) : (x)) #define CLIP_U16(x) ((x) > 65535) ? (65535) : (((x) < 0) ? (0) : (x)) -#define CLIP_S16(x) ((x) > 65535) ? (65535) : (((x) < -65536) ? (-65536) : (x)) +#define CLIP_S16(x) ((x) > 32767) ? (32767) : (((x) < -32768) ? (-32768) : (x)) #define INLINE #define PLD(x) __pld(x) diff --git a/common/mips/impeg2_platform_macros.h b/common/mips/impeg2_platform_macros.h index 05ff6da..183f1fa 100644 --- a/common/mips/impeg2_platform_macros.h +++ b/common/mips/impeg2_platform_macros.h @@ -41,7 +41,7 @@ static __inline UWORD32 CLZ(UWORD32 u4_word) #define CLIP_S12(x) ((x) > 2047) ? (2047) : (((x) < -2048) ? (-2048) : (x)) #define CLIP_U16(x) ((x) > 65535) ? (65535) : (((x) < 0) ? (0) : (x)) -#define CLIP_S16(x) ((x) > 65535) ? (65535) : (((x) < -65536) ? (-65536) : (x)) +#define CLIP_S16(x) ((x) > 32767) ? (32767) : (((x) < -32768) ? (-32768) : (x)) #define PLD(x) #define INLINE diff --git a/common/x86/impeg2_platform_macros.h b/common/x86/impeg2_platform_macros.h index 05ff6da..183f1fa 100644 --- a/common/x86/impeg2_platform_macros.h +++ b/common/x86/impeg2_platform_macros.h @@ -41,7 +41,7 @@ static __inline UWORD32 CLZ(UWORD32 u4_word) #define CLIP_S12(x) ((x) > 2047) ? (2047) : (((x) < -2048) ? (-2048) : (x)) #define CLIP_U16(x) ((x) > 65535) ? (65535) : (((x) < 0) ? (0) : (x)) -#define CLIP_S16(x) ((x) > 65535) ? (65535) : (((x) < -65536) ? (-65536) : (x)) +#define CLIP_S16(x) ((x) > 32767) ? (32767) : (((x) < -32768) ? (-32768) : (x)) #define PLD(x) #define INLINE |