| Message ID | 1490334508-23129-1-git-send-email-thomastdt@googlemail.com |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, Mar 23, 2017 at 10:48:28PM -0700, Thomas Turner wrote: > Signed-off-by: Thomas Turner <thomastdt@googlemail.com> > --- > libavcodec/Makefile | 1 + > libavcodec/tests/celp_math.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ > tests/fate/libavcodec.mak | 5 +++++ > 3 files changed, 54 insertions(+) > create mode 100644 libavcodec/tests/celp_math.c > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 89296cd..05be516 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -1024,6 +1024,7 @@ SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h > SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vda_vt_internal.h > > TESTPROGS = avpacket \ > + celp_math \ > imgconvert \ > jpeg2000dwt \ > mathops \ > diff --git a/libavcodec/tests/celp_math.c b/libavcodec/tests/celp_math.c > new file mode 100644 > index 0000000..da7846f > --- /dev/null > +++ b/libavcodec/tests/celp_math.c > @@ -0,0 +1,48 @@ > +/* > + * 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 "libavutil/libm.h" > +#include "libavcodec/celp_math.c" > + > +int main(void) > +{ > + int i; > + const float f1[3] = {0.0, 1.1, 2.2}; > + 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)); > + works fine on linux x86-32/64, mingw32/64, arm/mips qemu > + #define IsAlmostEqual(A, B, epsilon) \ the "#" must be in th efirst column for standards compliancy chaged that and applied thanks [...]
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 89296cd..05be516 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1024,6 +1024,7 @@ SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vda_vt_internal.h TESTPROGS = avpacket \ + celp_math \ imgconvert \ jpeg2000dwt \ mathops \ diff --git a/libavcodec/tests/celp_math.c b/libavcodec/tests/celp_math.c new file mode 100644 index 0000000..da7846f --- /dev/null +++ b/libavcodec/tests/celp_math.c @@ -0,0 +1,48 @@ +/* + * 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 "libavutil/libm.h" +#include "libavcodec/celp_math.c" + +int main(void) +{ + int i; + const float f1[3] = {0.0, 1.1, 2.2}; + 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); + + for (i = 1024; i >= 1; i/=2) + av_assert0(ff_log2_q15(i) == (1<<15)*((int)log2(i))+(1<<2)); + + return 0; +} diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak index 32b0c1e..07417f0 100644 --- a/tests/fate/libavcodec.mak +++ b/tests/fate/libavcodec.mak @@ -8,6 +8,11 @@ fate-cabac: libavcodec/tests/cabac$(EXESUF) fate-cabac: CMD = run libavcodec/tests/cabac fate-cabac: REF = /dev/null +FATE_LIBAVCODEC-yes += fate-celp_math +fate-celp_math: libavcodec/tests/celp_math$(EXESUF) +fate-celp_math: CMD = run libavcodec/tests/celp_math +fate-celp_math: REF = /dev/null + FATE_LIBAVCODEC-$(CONFIG_GOLOMB) += fate-golomb fate-golomb: libavcodec/tests/golomb$(EXESUF) fate-golomb: CMD = run libavcodec/tests/golomb
Signed-off-by: Thomas Turner <thomastdt@googlemail.com> --- libavcodec/Makefile | 1 + libavcodec/tests/celp_math.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ tests/fate/libavcodec.mak | 5 +++++ 3 files changed, 54 insertions(+) create mode 100644 libavcodec/tests/celp_math.c