diff options
author | Peter Ross <pross@xvid.org> | 2018-11-11 21:49:29 +1100 |
---|---|---|
committer | Peter Ross <pross@xvid.org> | 2018-11-28 22:16:07 +1100 |
commit | dea1224754fda003b0229c56bce6602a5699d8db (patch) | |
tree | f4beecac017fe6832442f73e4d6206fdc1501ffd | |
parent | 533ba0b6b5a5357fe8c19b3b5bb23fa16b6979f1 (diff) | |
download | ffmpeg-streaming-dea1224754fda003b0229c56bce6602a5699d8db.zip ffmpeg-streaming-dea1224754fda003b0229c56bce6602a5699d8db.tar.gz |
additional math.h functions for djgpp
-rw-r--r-- | compat/djgpp/math.c | 47 | ||||
-rw-r--r-- | compat/djgpp/math.h | 25 | ||||
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | tests/ref/fate/source | 1 |
4 files changed, 75 insertions, 0 deletions
diff --git a/compat/djgpp/math.c b/compat/djgpp/math.c new file mode 100644 index 0000000..777b879 --- /dev/null +++ b/compat/djgpp/math.c @@ -0,0 +1,47 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <math.h> + +#define FUN(name, type, op) \ +type name(type x, type y) \ +{ \ + if (fpclassify(x) == FP_NAN) return y; \ + if (fpclassify(y) == FP_NAN) return x; \ + return x op y ? x : y; \ +} + +FUN(fmin, double, <) +FUN(fmax, double, >) +FUN(fminf, float, <) +FUN(fmaxf, float, >) + +long double fmodl(long double x, long double y) +{ + return fmod(x, y); +} + +long double scalbnl(long double x, int exp) +{ + return scalbn(x, exp); +} + +long double copysignl(long double x, long double y) +{ + return copysign(x, y); +} diff --git a/compat/djgpp/math.h b/compat/djgpp/math.h new file mode 100644 index 0000000..4c02ea9 --- /dev/null +++ b/compat/djgpp/math.h @@ -0,0 +1,25 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +double fmin(double, double); +double fmax(double, double); +float fminf(float, float); +float fmaxf(float, float); +long double fmodl(long double, long double); +long double scalbnl(long double, int); +long double copysignl(long double, long double); @@ -5468,6 +5468,8 @@ EOF elif test_${pfx}cpp_condition sys/version.h "defined __DJGPP__"; then eval ${pfx}libc_type=djgpp add_cppflags -U__STRICT_ANSI__ + add_cflags "-include $source_path/compat/djgpp/math.h" + add_compat djgpp/math.o fi test_${pfx}cc <<EOF #include <time.h> diff --git a/tests/ref/fate/source b/tests/ref/fate/source index b35f016..0c98a06 100644 --- a/tests/ref/fate/source +++ b/tests/ref/fate/source @@ -28,6 +28,7 @@ compat/avisynth/avxsynth_c.h compat/avisynth/windowsPorts/basicDataTypeConversions.h compat/avisynth/windowsPorts/windows2linux.h compat/cuda/dynlink_loader.h +compat/djgpp/math.h compat/float/float.h compat/float/limits.h Use of av_clip() where av_clip_uintp2() could be used: |