frsh: Export information about the last RTP contract and VRES

[frescor/ffmpeg.git] / libavcodec / mathops.h

diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h
index 07265c81f5837fdd7d3eeb5f7ea369e93b349779..b92a6be1371c4d0a104c9008c7c2cb4a9e2430aa 100644 (file)
--- a/libavcodec/mathops.h
+++ b/libavcodec/mathops.h
@@ -1,6 +1,6 @@
 /*
  * simple math operations
- * Copyright (c) 2001, 2002 Fabrice Bellard.
+ * Copyright (c) 2001, 2002 Fabrice Bellard
  * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> et al
  *
  * This file is part of FFmpeg.
@@ -24,19 +24,19 @@
 
 #include "libavutil/common.h"
 
-#ifdef ARCH_X86_32
+#if   ARCH_X86
 
 #include "x86/mathops.h"
 
-#elif defined(ARCH_ARM)
+#elif ARCH_ARM
 
 #include "arm/mathops.h"
 
-#elif defined(ARCH_PPC)
+#elif ARCH_PPC
 
 #include "ppc/mathops.h"
 
-#elif defined(ARCH_BFIN)
+#elif ARCH_BFIN
 
 #include "bfin/mathops.h"
 
@@ -83,5 +83,42 @@ static av_always_inline int MULH(int a, int b){
 #   define MLS16(rt, ra, rb) ((rt) -= (ra) * (rb))
 #endif
 
+/* median of 3 */
+#ifndef mid_pred
+#define mid_pred mid_pred
+static inline av_const int mid_pred(int a, int b, int c)
+{
+#if 0
+    int t= (a-b)&((a-b)>>31);
+    a-=t;
+    b+=t;
+    b-= (b-c)&((b-c)>>31);
+    b+= (a-b)&((a-b)>>31);
+
+    return b;
+#else
+    if(a>b){
+        if(c>b){
+            if(c>a) b=a;
+            else    b=c;
+        }
+    }else{
+        if(b>c){
+            if(c>a) b=c;
+            else    b=a;
+        }
+    }
+    return b;
+#endif
+}
+#endif
+
+#ifndef sign_extend
+static inline av_const int sign_extend(int val, unsigned bits)
+{
+    return (val << (INT_BIT - bits)) >> (INT_BIT - bits);
+}
+#endif
+
 #endif /* AVCODEC_MATHOPS_H */