Merge commit '9064777dbb335ab4809ae09e3fdcc0245f925cdc'

* commit '9064777dbb335ab4809ae09e3fdcc0245f925cdc':
  checkasm: add HEVC test for testing IDCT DC

Merged-by: Clément Bœsch <cboesch@gopro.com>

diff --cc tests/checkasm/Makefile
index 22a74b600726d66a5abefbf668eb1ec750130531,d339b755a19eead254046d2d0e3484e4eba93685..f6b380672d708aa7911ae6c0aa2a8984598db9aa
--- 1/tests/checkasm/Makefile
--- 2/tests/checkasm/Makefile
+++ b/tests/checkasm/Makefile
@@@ -7,15 -6,11 +7,16 @@@ AVCODECOBJS-$(CONFIG_H264DSP
  AVCODECOBJS-$(CONFIG_H264PRED)          += h264pred.o
  AVCODECOBJS-$(CONFIG_H264QPEL)          += h264qpel.o
  AVCODECOBJS-$(CONFIG_VP8DSP)            += vp8dsp.o
 +AVCODECOBJS-$(CONFIG_VIDEODSP)          += videodsp.o
  
  # decoders/encoders
 -AVCODECOBJS-$(CONFIG_DCA_DECODER)       += dcadsp.o synth_filter.o
 -AVCODECOBJS-$(CONFIG_HEVC_DECODER)      += hevc_mc.o hevc_idct.o
 +AVCODECOBJS-$(CONFIG_ALAC_DECODER)      += alacdsp.o
 +AVCODECOBJS-$(CONFIG_DCA_DECODER)       += synth_filter.o
 +AVCODECOBJS-$(CONFIG_JPEG2000_DECODER)  += jpeg2000dsp.o
 +AVCODECOBJS-$(CONFIG_PIXBLOCKDSP)       += pixblockdsp.o
++AVCODECOBJS-$(CONFIG_HEVC_DECODER)      += hevc_idct.o
  AVCODECOBJS-$(CONFIG_V210_ENCODER)      += v210enc.o
 +AVCODECOBJS-$(CONFIG_VP9_DECODER)       += vp9dsp.o
  
  CHECKASMOBJS-$(CONFIG_AVCODEC)          += $(AVCODECOBJS-yes)
  

diff --cc tests/checkasm/checkasm.c
index f2dbce46d0e5663168a03f443924dec01e7243f3,b0621973a6e8db7d2c24f5753ea47e4aea7b67e7..f6719809e3b71a0f835e9ee2a0ee40a349767f17
--- 1/tests/checkasm/checkasm.c
--- 2/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@@ -64,57 -64,34 +64,60 @@@ static const struct 
      const char *name;
      void (*func)(void);
  } tests[] = {
 -#if CONFIG_BSWAPDSP
 -    { "bswapdsp", checkasm_check_bswapdsp },
 +#if CONFIG_AVCODEC
 +    #if CONFIG_ALAC_DECODER
 +        { "alacdsp", checkasm_check_alacdsp },
 +    #endif
 +    #if CONFIG_BSWAPDSP
 +        { "bswapdsp", checkasm_check_bswapdsp },
 +    #endif
 +    #if CONFIG_DCA_DECODER
 +        { "synth_filter", checkasm_check_synth_filter },
 +    #endif
 +    #if CONFIG_FLACDSP
 +        { "flacdsp", checkasm_check_flacdsp },
 +    #endif
 +    #if CONFIG_FMTCONVERT
 +        { "fmtconvert", checkasm_check_fmtconvert },
 +    #endif
 +    #if CONFIG_H264DSP
 +        { "h264dsp", checkasm_check_h264dsp },
 +    #endif
 +    #if CONFIG_H264PRED
 +        { "h264pred", checkasm_check_h264pred },
 +    #endif
 +    #if CONFIG_H264QPEL
 +        { "h264qpel", checkasm_check_h264qpel },
 +    #endif
++    #if CONFIG_HEVC_DECODER
++        { "hevc_idct", checkasm_check_hevc_idct },
++    #endif
 +    #if CONFIG_JPEG2000_DECODER
 +        { "jpeg2000dsp", checkasm_check_jpeg2000dsp },
 +    #endif
 +    #if CONFIG_PIXBLOCKDSP
 +        { "pixblockdsp", checkasm_check_pixblockdsp },
 +    #endif
 +    #if CONFIG_V210_ENCODER
 +        { "v210enc", checkasm_check_v210enc },
 +    #endif
 +    #if CONFIG_VP8DSP
 +        { "vp8dsp", checkasm_check_vp8dsp },
 +    #endif
 +    #if CONFIG_VP9_DECODER
 +        { "vp9dsp", checkasm_check_vp9dsp },
 +    #endif
 +    #if CONFIG_VIDEODSP
 +        { "videodsp", checkasm_check_videodsp },
 +    #endif
  #endif
 -#if CONFIG_DCA_DECODER
 -    { "dcadsp", checkasm_check_dcadsp },
 -    { "synth_filter", checkasm_check_synth_filter },
 -#endif
 -#if CONFIG_FMTCONVERT
 -    { "fmtconvert", checkasm_check_fmtconvert },
 -#endif
 -#if CONFIG_H264DSP
 -    { "h264dsp", checkasm_check_h264dsp },
 -#endif
 -#if CONFIG_H264PRED
 -    { "h264pred", checkasm_check_h264pred },
 -#endif
 -#if CONFIG_H264QPEL
 -    { "h264qpel", checkasm_check_h264qpel },
 -#endif
 -#if CONFIG_HEVC_DECODER
 -    { "hevc_mc", checkasm_check_hevc_mc },
 -    { "hevc_idct", checkasm_check_hevc_idct },
 -#endif
 -#if CONFIG_V210_ENCODER
 -    { "v210enc", checkasm_check_v210enc },
 -#endif
 -#if CONFIG_VP8DSP
 -    { "vp8dsp", checkasm_check_vp8dsp },
 +#if CONFIG_AVFILTER
 +    #if CONFIG_BLEND_FILTER
 +        { "vf_blend", checkasm_check_blend },
 +    #endif
 +    #if CONFIG_COLORSPACE_FILTER
 +        { "vf_colorspace", checkasm_check_colorspace },
 +    #endif
  #endif
      { NULL }
  };

diff --cc tests/checkasm/checkasm.h
index a8c955b3851f804abe494ced5c85a247c2fada77,73109c3afa2ca0545dd4014b4199eb393f021b4d..a3db2a91b96aae38d9189e99fb57f39d9503385f
--- 1/tests/checkasm/checkasm.h
--- 2/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@@ -40,8 -37,8 +40,9 @@@ void checkasm_check_fmtconvert(void)
  void checkasm_check_h264dsp(void);
  void checkasm_check_h264pred(void);
  void checkasm_check_h264qpel(void);
 -void checkasm_check_hevc_mc(void);
+ void checkasm_check_hevc_idct(void);
 +void checkasm_check_jpeg2000dsp(void);
 +void checkasm_check_pixblockdsp(void);
  void checkasm_check_synth_filter(void);
  void checkasm_check_v210enc(void);
  void checkasm_check_vp8dsp(void);

diff --cc tests/checkasm/hevc_idct.c
index 0000000000000000000000000000000000000000,84760b9bfac85af0f9d12dc772a48c3aa18c99e0..0e9ac40b970588ebf658ace9aba8e76c95a23615
mode 000000,100644..100644
--- /dev/null
--- 2/tests/checkasm/hevc_idct.c
+++ b/tests/checkasm/hevc_idct.c
@@@ -1,0 -1,73 +1,73 @@@
 - * This file is part of Libav.
+ /*
+  * Copyright (c) 2016 Alexandra Hájková
+  *
 - * Libav is free software; you can redistribute it and/or modify
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * FFmpeg is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  *
 - * with Libav; if not, write to the Free Software Foundation, Inc.,
++ * 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 General Public License for more details.
+  *
+  * You should have received a copy of the GNU 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 <string.h>
+ 
+ #include "libavutil/intreadwrite.h"
+ 
+ #include "libavcodec/hevcdsp.h"
+ 
+ #include "checkasm.h"
+ 
+ #define randomize_buffers(buf, size)            \
+     do {                                        \
+         int j;                                  \
+         for (j = 0; j < size; j++) {            \
+             int16_t r = rnd();                  \
+             AV_WN16A(buf + j, r);               \
+         }                                       \
+     } while (0)
+ 
+ static void check_idct_dc(HEVCDSPContext h, int bit_depth)
+ {
+     int i;
+     LOCAL_ALIGNED(32, int16_t, coeffs0, [32 * 32]);
+     LOCAL_ALIGNED(32, int16_t, coeffs1, [32 * 32]);
+ 
+     for (i = 2; i <= 5; i++) {
+         int block_size = 1 << i;
+         int size = block_size * block_size;
+         declare_func_emms(AV_CPU_FLAG_MMXEXT, void, int16_t *coeffs);
+ 
+         randomize_buffers(coeffs0, size);
+         memcpy(coeffs1, coeffs0, sizeof(*coeffs0) * size);
+ 
+         if (check_func(h.idct_dc[i - 2], "idct_%dx%d_dc_%d", block_size, block_size, bit_depth)) {
+             call_ref(coeffs0);
+             call_new(coeffs1);
+             if (memcmp(coeffs0, coeffs1, sizeof(*coeffs0) * size))
+                 fail();
+             bench_new(coeffs1);
+         }
+     }
+ }
+ 
+ void checkasm_check_hevc_idct(void)
+ {
+     int bit_depth;
+ 
+     for (bit_depth = 8; bit_depth <= 10; bit_depth++) {
+         HEVCDSPContext h;
+ 
+         ff_hevc_dsp_init(&h, bit_depth);
+         check_idct_dc(h, bit_depth);
+     }
+     report("idct_dc");
+ }