[FFmpeg-cvslog] r22345 - in trunk: libavcodec/motion_est.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/ra144.c libavcodec/ratecontrol.c libavcodec/roqaudioenc.c libavcodec/snow.c libavutil/interna...

[mru]

Author: mru
Date: Mon Mar  8 22:19:56 2010
New Revision: 22345

Log:
Move ff_sqrt() to libavutil/intmath.h

Modified:
   trunk/libavcodec/motion_est.c
   trunk/libavcodec/mpegvideo.c
   trunk/libavcodec/mpegvideo_enc.c
   trunk/libavcodec/ra144.c
   trunk/libavcodec/ratecontrol.c
   trunk/libavcodec/roqaudioenc.c
   trunk/libavcodec/snow.c
   trunk/libavutil/internal.h
   trunk/libavutil/intmath.h

Modified: trunk/libavcodec/motion_est.c
==============================================================================
--- trunk/libavcodec/motion_est.c	Mon Mar  8 21:59:00 2010	(r22344)
+++ trunk/libavcodec/motion_est.c	Mon Mar  8 22:19:56 2010	(r22345)
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <limits.h>
+#include "libavutil/intmath.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mathops.h"

Modified: trunk/libavcodec/mpegvideo.c
==============================================================================
--- trunk/libavcodec/mpegvideo.c	Mon Mar  8 21:59:00 2010	(r22344)
+++ trunk/libavcodec/mpegvideo.c	Mon Mar  8 22:19:56 2010	(r22345)
@@ -27,6 +27,7 @@
  * The simplest mpeg encoder (well, it was the simplest!).
  */
 
+#include "libavutil/intmath.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"

Modified: trunk/libavcodec/mpegvideo_enc.c
==============================================================================
--- trunk/libavcodec/mpegvideo_enc.c	Mon Mar  8 21:59:00 2010	(r22344)
+++ trunk/libavcodec/mpegvideo_enc.c	Mon Mar  8 22:19:56 2010	(r22345)
@@ -27,6 +27,7 @@
  * The simplest mpeg encoder (well, it was the simplest!).
  */
 
+#include "libavutil/intmath.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"

Modified: trunk/libavcodec/ra144.c
==============================================================================
--- trunk/libavcodec/ra144.c	Mon Mar  8 21:59:00 2010	(r22344)
+++ trunk/libavcodec/ra144.c	Mon Mar  8 22:19:56 2010	(r22345)
@@ -22,6 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intmath.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "ra144.h"

Modified: trunk/libavcodec/ratecontrol.c
==============================================================================
--- trunk/libavcodec/ratecontrol.c	Mon Mar  8 21:59:00 2010	(r22344)
+++ trunk/libavcodec/ratecontrol.c	Mon Mar  8 22:19:56 2010	(r22345)
@@ -25,6 +25,7 @@
  * Rate control for video encoders.
  */
 
+#include "libavutil/intmath.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "ratecontrol.h"

Modified: trunk/libavcodec/roqaudioenc.c
==============================================================================
--- trunk/libavcodec/roqaudioenc.c	Mon Mar  8 21:59:00 2010	(r22344)
+++ trunk/libavcodec/roqaudioenc.c	Mon Mar  8 22:19:56 2010	(r22345)
@@ -21,6 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intmath.h"
 #include "avcodec.h"
 #include "bytestream.h"
 

Modified: trunk/libavcodec/snow.c
==============================================================================
--- trunk/libavcodec/snow.c	Mon Mar  8 21:59:00 2010	(r22344)
+++ trunk/libavcodec/snow.c	Mon Mar  8 22:19:56 2010	(r22345)
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intmath.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "snow.h"

Modified: trunk/libavutil/internal.h
==============================================================================
--- trunk/libavutil/internal.h	Mon Mar  8 21:59:00 2010	(r22344)
+++ trunk/libavutil/internal.h	Mon Mar  8 22:19:56 2010	(r22345)
@@ -128,28 +128,6 @@
 
 /* math */
 
-extern const uint8_t ff_sqrt_tab[256];
-
-static inline av_const unsigned int ff_sqrt(unsigned int a)
-{
-    unsigned int b;
-
-    if (a < 255) return (ff_sqrt_tab[a + 1] - 1) >> 4;
-    else if (a < (1 << 12)) b = ff_sqrt_tab[a >> 4] >> 2;
-#if !CONFIG_SMALL
-    else if (a < (1 << 14)) b = ff_sqrt_tab[a >> 6] >> 1;
-    else if (a < (1 << 16)) b = ff_sqrt_tab[a >> 8]   ;
-#endif
-    else {
-        int s = av_log2_16bit(a >> 16) >> 1;
-        unsigned int c = a >> (s + 2);
-        b = ff_sqrt_tab[c >> (s + 8)];
-        b = FASTDIV(c,b) + (b << s);
-    }
-
-    return b - (a < b * b);
-}
-
 #if ARCH_X86
 #define MASK_ABS(mask, level)\
             __asm__ volatile(\

Modified: trunk/libavutil/intmath.h
==============================================================================
--- trunk/libavutil/intmath.h	Mon Mar  8 21:59:00 2010	(r22344)
+++ trunk/libavutil/intmath.h	Mon Mar  8 22:19:56 2010	(r22345)
@@ -56,4 +56,26 @@ extern const uint32_t ff_inverse[257];
 
 #endif /* FASTDIV */
 
+extern const uint8_t ff_sqrt_tab[256];
+
+static inline av_const unsigned int ff_sqrt(unsigned int a)
+{
+    unsigned int b;
+
+    if (a < 255) return (ff_sqrt_tab[a + 1] - 1) >> 4;
+    else if (a < (1 << 12)) b = ff_sqrt_tab[a >> 4] >> 2;
+#if !CONFIG_SMALL
+    else if (a < (1 << 14)) b = ff_sqrt_tab[a >> 6] >> 1;
+    else if (a < (1 << 16)) b = ff_sqrt_tab[a >> 8]   ;
+#endif
+    else {
+        int s = av_log2_16bit(a >> 16) >> 1;
+        unsigned int c = a >> (s + 2);
+        b = ff_sqrt_tab[c >> (s + 8)];
+        b = FASTDIV(c,b) + (b << s);
+    }
+
+    return b - (a < b * b);
+}
+
 #endif /* AVUTIL_INTMATH_H */