Skip to content

F
ffmpeg.wasm-core
Commit 1389b4c1 authored by Katerina Barone-Adesi's avatar Katerina Barone-Adesi Committed by Vittorio Giovara
Browse files
Options

idct8x8: Fix undefined negative shifts 

The original code left-shifts negative values, which is undefined
in the C99 specification (the one used during normal Libav compilation).
This change multiplies by (1 << shift), which is functionally equivalent,
but has defined behavior.

With this change, fate-idct8x8 compiled with --fsanitize=undefined works.

Bug-Id: 686
parent e10b7ef2
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
libavcodec/jfdctint_template.c
View file @ 1389b4c1
...@@ -216,8 +216,8 @@ static av_always_inline void FUNC(row_fdct)(int16_t *data) ...@@ -216,8 +216,8 @@ static av_always_inline void FUNC(row_fdct)(int16_t *data)
tmp11 = tmp1 + tmp2; tmp11 = tmp1 + tmp2;
tmp12 = tmp1 - tmp2; tmp12 = tmp1 - tmp2;
dataptr[0] = (int16_t) ((tmp10 + tmp11) << PASS1_BITS); dataptr[0] = (int16_t) ((tmp10 + tmp11) * (1 << PASS1_BITS));
dataptr[4] = (int16_t) ((tmp10 - tmp11) << PASS1_BITS); dataptr[4] = (int16_t) ((tmp10 - tmp11) * (1 << PASS1_BITS));
z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100); z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);
dataptr[2] = (int16_t) DESCALE(z1 + MULTIPLY(tmp13, FIX_0_765366865), dataptr[2] = (int16_t) DESCALE(z1 + MULTIPLY(tmp13, FIX_0_765366865),
......
libavcodec/jrevdct.c
View file @ 1389b4c1
...@@ -251,8 +251,8 @@ void ff_j_rev_dct(DCTBLOCK data) ...@@ -251,8 +251,8 @@ void ff_j_rev_dct(DCTBLOCK data)
/* AC terms all zero */ /* AC terms all zero */
if (d0) { if (d0) {
/* Compute a 32 bit value to assign. */ /* Compute a 32 bit value to assign. */
int16_t dcval = (int16_t) (d0 << PASS1_BITS); int16_t dcval = (int16_t) (d0 * (1 << PASS1_BITS));
register int v = (dcval & 0xffff) | ((dcval << 16) & 0xffff0000); register int v = (dcval & 0xffff) | ((dcval * (1 << 16)) & 0xffff0000);
idataptr[0] = v; idataptr[0] = v;
idataptr[1] = v; idataptr[1] = v;
...@@ -274,8 +274,8 @@ void ff_j_rev_dct(DCTBLOCK data) ...@@ -274,8 +274,8 @@ void ff_j_rev_dct(DCTBLOCK data)
tmp2 = z1 + MULTIPLY(-d6, FIX_1_847759065); tmp2 = z1 + MULTIPLY(-d6, FIX_1_847759065);
tmp3 = z1 + MULTIPLY(d2, FIX_0_765366865); tmp3 = z1 + MULTIPLY(d2, FIX_0_765366865);
tmp0 = (d0 + d4) << CONST_BITS; tmp0 = (d0 + d4) * CONST_SCALE;
tmp1 = (d0 - d4) << CONST_BITS; tmp1 = (d0 - d4) * CONST_SCALE;
tmp10 = tmp0 + tmp3; tmp10 = tmp0 + tmp3;
tmp13 = tmp0 - tmp3; tmp13 = tmp0 - tmp3;
...@@ -286,8 +286,8 @@ void ff_j_rev_dct(DCTBLOCK data) ...@@ -286,8 +286,8 @@ void ff_j_rev_dct(DCTBLOCK data)
tmp2 = MULTIPLY(-d6, FIX_1_306562965); tmp2 = MULTIPLY(-d6, FIX_1_306562965);
tmp3 = MULTIPLY(d6, FIX_0_541196100); tmp3 = MULTIPLY(d6, FIX_0_541196100);
tmp0 = (d0 + d4) << CONST_BITS; tmp0 = (d0 + d4) * CONST_SCALE;
tmp1 = (d0 - d4) << CONST_BITS; tmp1 = (d0 - d4) * CONST_SCALE;
tmp10 = tmp0 + tmp3; tmp10 = tmp0 + tmp3;
tmp13 = tmp0 - tmp3; tmp13 = tmp0 - tmp3;
...@@ -300,8 +300,8 @@ void ff_j_rev_dct(DCTBLOCK data) ...@@ -300,8 +300,8 @@ void ff_j_rev_dct(DCTBLOCK data)
tmp2 = MULTIPLY(d2, FIX_0_541196100); tmp2 = MULTIPLY(d2, FIX_0_541196100);
tmp3 = MULTIPLY(d2, FIX_1_306562965); tmp3 = MULTIPLY(d2, FIX_1_306562965);
tmp0 = (d0 + d4) << CONST_BITS; tmp0 = (d0 + d4) * CONST_SCALE;
tmp1 = (d0 - d4) << CONST_BITS; tmp1 = (d0 - d4) * CONST_SCALE;
tmp10 = tmp0 + tmp3; tmp10 = tmp0 + tmp3;
tmp13 = tmp0 - tmp3; tmp13 = tmp0 - tmp3;
...@@ -309,8 +309,8 @@ void ff_j_rev_dct(DCTBLOCK data) ...@@ -309,8 +309,8 @@ void ff_j_rev_dct(DCTBLOCK data)
tmp12 = tmp1 - tmp2; tmp12 = tmp1 - tmp2;
} else { } else {
/* d0 != 0, d2 == 0, d4 != 0, d6 == 0 */ /* d0 != 0, d2 == 0, d4 != 0, d6 == 0 */
tmp10 = tmp13 = (d0 + d4) << CONST_BITS; tmp10 = tmp13 = (d0 + d4) * CONST_SCALE;
tmp11 = tmp12 = (d0 - d4) << CONST_BITS; tmp11 = tmp12 = (d0 - d4) * CONST_SCALE;
} }
} }
...@@ -620,8 +620,8 @@ void ff_j_rev_dct(DCTBLOCK data) ...@@ -620,8 +620,8 @@ void ff_j_rev_dct(DCTBLOCK data)
tmp2 = z1 + MULTIPLY(-d6, FIX_1_847759065); tmp2 = z1 + MULTIPLY(-d6, FIX_1_847759065);
tmp3 = z1 + MULTIPLY(d2, FIX_0_765366865); tmp3 = z1 + MULTIPLY(d2, FIX_0_765366865);
tmp0 = (d0 + d4) << CONST_BITS; tmp0 = (d0 + d4) * CONST_SCALE;
tmp1 = (d0 - d4) << CONST_BITS; tmp1 = (d0 - d4) * CONST_SCALE;
tmp10 = tmp0 + tmp3; tmp10 = tmp0 + tmp3;
tmp13 = tmp0 - tmp3; tmp13 = tmp0 - tmp3;
...@@ -632,8 +632,8 @@ void ff_j_rev_dct(DCTBLOCK data) ...@@ -632,8 +632,8 @@ void ff_j_rev_dct(DCTBLOCK data)
tmp2 = MULTIPLY(-d6, FIX_1_306562965); tmp2 = MULTIPLY(-d6, FIX_1_306562965);
tmp3 = MULTIPLY(d6, FIX_0_541196100); tmp3 = MULTIPLY(d6, FIX_0_541196100);
tmp0 = (d0 + d4) << CONST_BITS; tmp0 = (d0 + d4) * CONST_SCALE;
tmp1 = (d0 - d4) << CONST_BITS; tmp1 = (d0 - d4) * CONST_SCALE;
tmp10 = tmp0 + tmp3; tmp10 = tmp0 + tmp3;
tmp13 = tmp0 - tmp3; tmp13 = tmp0 - tmp3;
...@@ -646,8 +646,8 @@ void ff_j_rev_dct(DCTBLOCK data) ...@@ -646,8 +646,8 @@ void ff_j_rev_dct(DCTBLOCK data)
tmp2 = MULTIPLY(d2, FIX_0_541196100); tmp2 = MULTIPLY(d2, FIX_0_541196100);
tmp3 = MULTIPLY(d2, FIX_1_306562965); tmp3 = MULTIPLY(d2, FIX_1_306562965);
tmp0 = (d0 + d4) << CONST_BITS; tmp0 = (d0 + d4) * CONST_SCALE;
tmp1 = (d0 - d4) << CONST_BITS; tmp1 = (d0 - d4) * CONST_SCALE;
tmp10 = tmp0 + tmp3; tmp10 = tmp0 + tmp3;
tmp13 = tmp0 - tmp3; tmp13 = tmp0 - tmp3;
...@@ -655,8 +655,8 @@ void ff_j_rev_dct(DCTBLOCK data) ...@@ -655,8 +655,8 @@ void ff_j_rev_dct(DCTBLOCK data)
tmp12 = tmp1 - tmp2; tmp12 = tmp1 - tmp2;
} else { } else {
/* d0 != 0, d2 == 0, d4 != 0, d6 == 0 */ /* d0 != 0, d2 == 0, d4 != 0, d6 == 0 */
tmp10 = tmp13 = (d0 + d4) << CONST_BITS; tmp10 = tmp13 = (d0 + d4) * CONST_SCALE;
tmp11 = tmp12 = (d0 - d4) << CONST_BITS; tmp11 = tmp12 = (d0 - d4) * CONST_SCALE;
} }
} }
......
libavcodec/simple_idct_template.c
View file @ 1389b4c1
...@@ -96,12 +96,12 @@ static inline void FUNC(idctRowCondDC)(int16_t *row, int extra_shift) ...@@ -96,12 +96,12 @@ static inline void FUNC(idctRowCondDC)(int16_t *row, int extra_shift)
if (((((uint64_t *)row)[0] & ~ROW0_MASK) | ((uint64_t *)row)[1]) == 0) { if (((((uint64_t *)row)[0] & ~ROW0_MASK) | ((uint64_t *)row)[1]) == 0) {
uint64_t temp; uint64_t temp;
if (DC_SHIFT - extra_shift > 0) { if (DC_SHIFT - extra_shift > 0) {
temp = (row[0] << (DC_SHIFT - extra_shift)) & 0xffff; temp = (row[0] * (1 << (DC_SHIFT - extra_shift))) & 0xffff;
} else { } else {
temp = (row[0] >> (extra_shift - DC_SHIFT)) & 0xffff; temp = (row[0] >> (extra_shift - DC_SHIFT)) & 0xffff;
} }
temp += temp << 16; temp += temp * (1 << 16);
temp += temp << 32; temp += temp * ((uint64_t) 1 << 32);
((uint64_t *)row)[0] = temp; ((uint64_t *)row)[0] = temp;
((uint64_t *)row)[1] = temp; ((uint64_t *)row)[1] = temp;
return; return;
...@@ -113,11 +113,11 @@ static inline void FUNC(idctRowCondDC)(int16_t *row, int extra_shift) ...@@ -113,11 +113,11 @@ static inline void FUNC(idctRowCondDC)(int16_t *row, int extra_shift)
row[1])) { row[1])) {
uint32_t temp; uint32_t temp;
if (DC_SHIFT - extra_shift > 0) { if (DC_SHIFT - extra_shift > 0) {
temp = (row[0] << (DC_SHIFT - extra_shift)) & 0xffff; temp = (row[0] * (1 << (DC_SHIFT - extra_shift))) & 0xffff;
} else { } else {
temp = (row[0] >> (extra_shift - DC_SHIFT)) & 0xffff; temp = (row[0] >> (extra_shift - DC_SHIFT)) & 0xffff;
} }
temp += temp << 16; temp += temp * (1 << 16);
((uint32_t*)row)[0]=((uint32_t*)row)[1] = ((uint32_t*)row)[0]=((uint32_t*)row)[1] =
((uint32_t*)row)[2]=((uint32_t*)row)[3] = temp; ((uint32_t*)row)[2]=((uint32_t*)row)[3] = temp;
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment