summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-04-17 16:36:01 -0700
committerMarco Nelissen <marcone@google.com>2015-10-09 11:41:23 -0700
commitf85f2e5a77a578fc14bf95fa05025add350e7f9e (patch)
treebc882c26a56bf1aac02a224f5d7e92b1356ba8ac
parentb34913857dacd4b7f82715c48ae1de9c56ede9e0 (diff)
downloadandroid_external_libmpeg2-f85f2e5a77a578fc14bf95fa05025add350e7f9e.tar.gz
android_external_libmpeg2-f85f2e5a77a578fc14bf95fa05025add350e7f9e.tar.bz2
android_external_libmpeg2-f85f2e5a77a578fc14bf95fa05025add350e7f9e.zip
fix CLIP_S16
Change-Id: Iec059e0f2790e07243d9890232459c52869836cd
-rw-r--r--common/armv8/impeg2_platform_macros.h2
-rw-r--r--common/mips/impeg2_platform_macros.h2
-rw-r--r--common/x86/impeg2_platform_macros.h2
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