[FFmpeg-cvslog] avcodec/tests/celp_math: Change IsAlmostEqual() to a function

Michael Niedermayer git at videolan.org
Fri Mar 24 19:19:33 EET 2017


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Mar 24 17:45:56 2017 +0100| [d92ad42fb38a312c86b71b0e17fe860f0c881be4] | committer: Michael Niedermayer

avcodec/tests/celp_math: Change IsAlmostEqual() to a function

Fixes empty statement, found by ubitux

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d92ad42fb38a312c86b71b0e17fe860f0c881be4
---

 libavcodec/tests/celp_math.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/libavcodec/tests/celp_math.c b/libavcodec/tests/celp_math.c
index 4b1c186..669ea70 100644
--- a/libavcodec/tests/celp_math.c
+++ b/libavcodec/tests/celp_math.c
@@ -19,6 +19,15 @@
 #include "libavutil/libm.h"
 #include "libavcodec/celp_math.c"
 
+static inline void IsAlmostEqual(float A, float B, float epsilon)
+{
+    float diff = fabsf(A - B);
+    float absa = fabsf(A);
+    float absb = fabsf(B);
+    float largest = (absb > absa) ? absb : absa;
+    av_assert0(diff <= largest * epsilon);
+}
+
 int main(void)
 {
     int i;
@@ -26,18 +35,10 @@ int main(void)
     const float f2[3]   = {3.3,  4.4,  5.5};
     const int16_t i1[3] = {6,  7,  8};
     const int16_t i2[3] = {9, 10, 11};
-    float diff, largest, absa, absb;
 
     float   r = ff_dot_productf(f1, f2, FF_ARRAY_ELEMS(f1));
     int64_t d = ff_dot_product(i1, i2, FF_ARRAY_ELEMS(i1));
 
-#   define IsAlmostEqual(A, B, epsilon) \
-        diff = fabsf(A - B); \
-        absa = fabsf(A); \
-        absb = fabsf(B); \
-        largest = (absb > absa) ? absb : absa; \
-        av_assert0(diff <= largest * epsilon);
-
     IsAlmostEqual(16.94f, r, 0.000001f);
     av_assert0(212 == d);
 



More information about the ffmpeg-cvslog mailing list