RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/jrevdct: Fix UB left shifts of negative numbers 

Affected the rv20-1239 FATE test.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-09-28 19:55:42 +02:00
parent 87cc318bc2
commit fe3c2c8bbe
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libavcodec/jrevdct.c
View File

@ -255,7 +255,7 @@ void ff_j_rev_dct(DCTBLOCK data)
if (d0) {
/* Compute a 32 bit value to assign. */
int16_t dcval = (int16_t) (d0 * (1 << PASS1_BITS));
register int v = (dcval & 0xffff) | ((dcval * (1 << 16)) & 0xffff0000);
register unsigned v = (dcval & 0xffff) | ((uint32_t)dcval << 16);
AV_WN32A(&idataptr[ 0], v);
AV_WN32A(&idataptr[ 4], v);
@ -988,8 +988,8 @@ void ff_j_rev_dct4(DCTBLOCK data)
/* AC terms all zero */
if (d0) {
/* Compute a 32 bit value to assign. */
int16_t dcval = (int16_t) (d0 << PASS1_BITS);
register int v = (dcval & 0xffff) | ((dcval << 16) & 0xffff0000);
int16_t dcval = (int16_t) (d0 * (1 << PASS1_BITS));
register unsigned v = (dcval & 0xffff) | ((uint32_t)dcval << 16);
AV_WN32A(&idataptr[0], v);
AV_WN32A(&idataptr[4], v);
@ -1008,8 +1008,8 @@ void ff_j_rev_dct4(DCTBLOCK data)
tmp2 = z1 + MULTIPLY(-d6, FIX_1_847759065);
tmp3 = z1 + MULTIPLY(d2, FIX_0_765366865);
tmp0 = (d0 + d4) << CONST_BITS;
tmp1 = (d0 - d4) << CONST_BITS;
tmp0 = (d0 + d4) * (1 << CONST_BITS);
tmp1 = (d0 - d4) * (1 << CONST_BITS);
tmp10 = tmp0 + tmp3;
tmp13 = tmp0 - tmp3;
@ -1020,8 +1020,8 @@ void ff_j_rev_dct4(DCTBLOCK data)
tmp2 = MULTIPLY(-d6, FIX_1_306562965);
tmp3 = MULTIPLY(d6, FIX_0_541196100);
tmp0 = (d0 + d4) << CONST_BITS;
tmp1 = (d0 - d4) << CONST_BITS;
tmp0 = (d0 + d4) * (1 << CONST_BITS);
tmp1 = (d0 - d4) * (1 << CONST_BITS);
tmp10 = tmp0 + tmp3;
tmp13 = tmp0 - tmp3;
@ -1034,8 +1034,8 @@ void ff_j_rev_dct4(DCTBLOCK data)
tmp2 = MULTIPLY(d2, FIX_0_541196100);
tmp3 = MULTIPLY(d2, FIX_1_306562965);
tmp0 = (d0 + d4) << CONST_BITS;
tmp1 = (d0 - d4) << CONST_BITS;
tmp0 = (d0 + d4) * (1 << CONST_BITS);
tmp1 = (d0 - d4) * (1 << CONST_BITS);
tmp10 = tmp0 + tmp3;
tmp13 = tmp0 - tmp3;
@ -1043,8 +1043,8 @@ void ff_j_rev_dct4(DCTBLOCK data)
tmp12 = tmp1 - tmp2;
} else {
/* d0 != 0, d2 == 0, d4 != 0, d6 == 0 */
tmp10 = tmp13 = (d0 + d4) << CONST_BITS;
tmp11 = tmp12 = (d0 - d4) << CONST_BITS;
tmp10 = tmp13 = (d0 + d4) * (1 << CONST_BITS);
tmp11 = tmp12 = (d0 - d4) * (1 << CONST_BITS);
}
}
@ -1086,8 +1086,8 @@ void ff_j_rev_dct4(DCTBLOCK data)
tmp2 = z1 + MULTIPLY(-d6, FIX_1_847759065);
tmp3 = z1 + MULTIPLY(d2, FIX_0_765366865);
tmp0 = (d0 + d4) << CONST_BITS;
tmp1 = (d0 - d4) << CONST_BITS;
tmp0 = (d0 + d4) * (1 << CONST_BITS);
tmp1 = (d0 - d4) * (1 << CONST_BITS);
tmp10 = tmp0 + tmp3;
tmp13 = tmp0 - tmp3;
@ -1098,8 +1098,8 @@ void ff_j_rev_dct4(DCTBLOCK data)
tmp2 = MULTIPLY(-d6, FIX_1_306562965);
tmp3 = MULTIPLY(d6, FIX_0_541196100);
tmp0 = (d0 + d4) << CONST_BITS;
tmp1 = (d0 - d4) << CONST_BITS;
tmp0 = (d0 + d4) * (1 << CONST_BITS);
tmp1 = (d0 - d4) * (1 << CONST_BITS);
tmp10 = tmp0 + tmp3;
tmp13 = tmp0 - tmp3;
@ -1112,8 +1112,8 @@ void ff_j_rev_dct4(DCTBLOCK data)
tmp2 = MULTIPLY(d2, FIX_0_541196100);
tmp3 = MULTIPLY(d2, FIX_1_306562965);
tmp0 = (d0 + d4) << CONST_BITS;
tmp1 = (d0 - d4) << CONST_BITS;
tmp0 = (d0 + d4) * (1 << CONST_BITS);
tmp1 = (d0 - d4) * (1 << CONST_BITS);
tmp10 = tmp0 + tmp3;
tmp13 = tmp0 - tmp3;
@ -1121,8 +1121,8 @@ void ff_j_rev_dct4(DCTBLOCK data)
tmp12 = tmp1 - tmp2;
} else {
/* d0 != 0, d2 == 0, d4 != 0, d6 == 0 */
tmp10 = tmp13 = (d0 + d4) << CONST_BITS;
tmp11 = tmp12 = (d0 - d4) << CONST_BITS;
tmp10 = tmp13 = (d0 + d4) * (1 << CONST_BITS);
tmp11 = tmp12 = (d0 - d4) * (1 << CONST_BITS);
}
}