Merge commit 'e48746deec48e9ff195841bc3266b4e153a878cd'

* commit 'e48746deec48e9ff195841bc3266b4e153a878cd':
  checkasm: h264dsp: Move the x and y variables into the randomize_buffer macro

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2016-11-13 23:02:39 +01:00
commit f75035b06f
1 changed files with 2 additions and 2 deletions

View File

@ -34,6 +34,7 @@ static const uint32_t pixel_mask[3] = { 0xffffffff, 0x01ff01ff, 0x03ff03ff };
#define randomize_buffers() \ #define randomize_buffers() \
do { \ do { \
int x, y; \
uint32_t mask = pixel_mask[bit_depth - 8]; \ uint32_t mask = pixel_mask[bit_depth - 8]; \
for (y = 0; y < sz; y++) { \ for (y = 0; y < sz; y++) { \
for (x = 0; x < PIXEL_STRIDE; x += 4) { \ for (x = 0; x < PIXEL_STRIDE; x += 4) { \
@ -178,8 +179,7 @@ static void check_idct(void)
LOCAL_ALIGNED_16(int16_t, subcoef0, [8 * 8 * 2]); LOCAL_ALIGNED_16(int16_t, subcoef0, [8 * 8 * 2]);
LOCAL_ALIGNED_16(int16_t, subcoef1, [8 * 8 * 2]); LOCAL_ALIGNED_16(int16_t, subcoef1, [8 * 8 * 2]);
H264DSPContext h; H264DSPContext h;
int bit_depth, sz, align; int bit_depth, sz, align, dc;
int x, y, dc;
declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, int16_t *block, int stride); declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, int16_t *block, int stride);
for (bit_depth = 8; bit_depth <= 10; bit_depth++) { for (bit_depth = 8; bit_depth <= 10; bit_depth++) {