document the fact that av_new_stream() can't be called in a background thread

[ffmpeg] / libavutil / rational.c

diff --git a/libavutil/rational.c b/libavutil/rational.c
index f7750e9e98dc5f522d63129c58bd27bb7d7951cc..701f06717e4fb0f11c9f333e2fa8f2633ad99f9b 100644 (file)
--- a/libavutil/rational.c
+++ b/libavutil/rational.c
@@ -1,5 +1,5 @@
 /*
- * Rational numbers
+ * rational numbers
  * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
  *
  * This file is part of FFmpeg.
@@ -20,12 +20,12 @@
  */
 
 /**
- * @file rational.c
- * Rational numbers
+ * @file
+ * rational numbers
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#include <assert.h>
+#include "avassert.h"
 //#include <math.h>
 #include <limits.h>
 
@@ -33,23 +33,23 @@
 #include "mathematics.h"
 #include "rational.h"
 
-int av_reduce(int *dst_nom, int *dst_den, int64_t nom, int64_t den, int64_t max){
+int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max){
     AVRational a0={0,1}, a1={1,0};
-    int sign= (nom<0) ^ (den<0);
-    int64_t gcd= av_gcd(FFABS(nom), FFABS(den));
+    int sign= (num<0) ^ (den<0);
+    int64_t gcd= av_gcd(FFABS(num), FFABS(den));
 
     if(gcd){
-        nom = FFABS(nom)/gcd;
+        num = FFABS(num)/gcd;
         den = FFABS(den)/gcd;
     }
-    if(nom<=max && den<=max){
-        a1= (AVRational){nom, den};
+    if(num<=max && den<=max){
+        a1= (AVRational){num, den};
         den=0;
     }
 
     while(den){
-        uint64_t x      = nom / den;
-        int64_t next_den= nom - den*x;
+        uint64_t x      = num / den;
+        int64_t next_den= num - den*x;
         int64_t a2n= x*a1.num + a0.num;
         int64_t a2d= x*a1.den + a0.den;
 
@@ -57,19 +57,19 @@ int av_reduce(int *dst_nom, int *dst_den, int64_t nom, int64_t den, int64_t max)
             if(a1.num) x= (max - a0.num) / a1.num;
             if(a1.den) x= FFMIN(x, (max - a0.den) / a1.den);
 
-            if (den*(2*x*a1.den + a0.den) > nom*a1.den)
+            if (den*(2*x*a1.den + a0.den) > num*a1.den)
                 a1 = (AVRational){x*a1.num + a0.num, x*a1.den + a0.den};
             break;
         }
 
         a0= a1;
         a1= (AVRational){a2n, a2d};
-        nom= den;
+        num= den;
         den= next_den;
     }
-    assert(av_gcd(a1.num, a1.den) <= 1U);
+    av_assert2(av_gcd(a1.num, a1.den) <= 1U);
 
-    *dst_nom = sign ? -a1.num : a1.num;
+    *dst_num = sign ? -a1.num : a1.num;
     *dst_den = a1.den;
 
     return den==0;
@@ -96,8 +96,14 @@ AVRational av_sub_q(AVRational b, AVRational c){
 AVRational av_d2q(double d, int max){
     AVRational a;
 #define LOG2  0.69314718055994530941723212145817656807550013436025
-    int exponent= FFMAX( (int)(log(fabs(d) + 1e-20)/LOG2), 0);
-    int64_t den= 1LL << (61 - exponent);
+    int exponent;
+    int64_t den;
+    if (isnan(d))
+        return (AVRational){0,0};
+    if (isinf(d))
+        return (AVRational){ d<0 ? -1:1, 0 };
+    exponent = FFMAX( (int)(log(fabs(d) + 1e-20)/LOG2), 0);
+    den = 1LL << (61 - exponent);
     av_reduce(&a.num, &a.den, (int64_t)(d * den + 0.5), den, max);
 
     return a;
@@ -127,3 +133,23 @@ int av_find_nearest_q_idx(AVRational q, const AVRational* q_list)
 
     return nearest_q_idx;
 }
+
+#ifdef TEST
+main(){
+    AVRational a,b;
+    for(a.num=-2; a.num<=2; a.num++){
+        for(a.den=-2; a.den<=2; a.den++){
+            for(b.num=-2; b.num<=2; b.num++){
+                for(b.den=-2; b.den<=2; b.den++){
+                    int c= av_cmp_q(a,b);
+                    double d= av_q2d(a) == av_q2d(b) ? 0 : (av_q2d(a) - av_q2d(b));
+                    if(d>0) d=1;
+                    else if(d<0) d=-1;
+                    else if(d != d) d= INT_MIN;
+                    if(c!=d) av_log(0, AV_LOG_ERROR, "%d/%d %d/%d, %d %f\n", a.num, a.den, b.num, b.den, c,d);
+                }
+            }
+        }
+    }
+}
+#endif