[FFmpeg-devel] [PATCH 1/2] Move ff_sqrt() to libavutil/intmath.h

[Mans Rullgard]

---
 libavcodec/motion_est.c    |    1 +
 libavcodec/mpegvideo.c     |    1 +
 libavcodec/mpegvideo_enc.c |    1 +
 libavcodec/ra144.c         |    1 +
 libavcodec/ratecontrol.c   |    1 +
 libavcodec/roqaudioenc.c   |    1 +
 libavcodec/snow.c          |    1 +
 libavutil/internal.h       |   22 ----------------------
 libavutil/intmath.h        |   22 ++++++++++++++++++++++
 9 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 047fbd6..1f5dbc7 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -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"
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index be78679..b8f9beb 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -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"
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 127b992..cb41c57 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -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"
diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c
index 04eb955..deda412 100644
--- a/libavcodec/ra144.c
+++ b/libavcodec/ra144.c
@@ -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"
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index 442dc72..02a235c 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -25,6 +25,7 @@
  * Rate control for video encoders.
  */
 
+#include "libavutil/intmath.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "ratecontrol.h"
diff --git a/libavcodec/roqaudioenc.c b/libavcodec/roqaudioenc.c
index acb1b5f..b44d5d3 100644
--- a/libavcodec/roqaudioenc.c
+++ b/libavcodec/roqaudioenc.c
@@ -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"
 
diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index 046e4c6..d51c998 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -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"
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 5e5a3fc..a9c2ff5 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -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(\
diff --git a/libavutil/intmath.h b/libavutil/intmath.h
index 7aff78c..02870cb 100644
--- a/libavutil/intmath.h
+++ b/libavutil/intmath.h
@@ -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 */
-- 
1.7.0.2