virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

postproc/postprocess_template: Fix reading uninitialized pixels in dering_C()

Browse Source 
This issue was found through the new blocktest

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2025-04-22 03:35:31 +02:00
parent 8bb682d454
commit 0118f392be
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpostproc/postprocess_altivec_template.c
View File

@ -530,7 +530,7 @@ static inline void doVertDefFilter_altivec(uint8_t src[], int stride, PPContext
STORE(5) STORE(5)
} }
static inline void dering_altivec(uint8_t src[], int stride, PPContext *c) { static inline void dering_altivec(uint8_t src[], int stride, PPContext *c, int leftborder, int rightborder) {
const vector signed int vsint32_8 = vec_splat_s32(8); const vector signed int vsint32_8 = vec_splat_s32(8);
const vector unsigned int vuint32_4 = vec_splat_u32(4); const vector unsigned int vuint32_4 = vec_splat_u32(4);
const vector signed char neg1 = vec_splat_s8(-1); const vector signed char neg1 = vec_splat_s8(-1);

14
libpostproc/postprocess_template.c
View File

@ -831,7 +831,7 @@ static inline void RENAME(doVertDefFilter)(uint8_t src[], int stride, PPContext
#endif //TEMPLATE_PP_ALTIVEC #endif //TEMPLATE_PP_ALTIVEC
#if !TEMPLATE_PP_ALTIVEC #if !TEMPLATE_PP_ALTIVEC
static inline void RENAME(dering)(uint8_t src[], int stride, PPContext *c) static inline void RENAME(dering)(uint8_t src[], int stride, PPContext *c, int leftborder, int rightborder)
{ {
#if TEMPLATE_PP_MMXEXT && HAVE_7REGS #if TEMPLATE_PP_MMXEXT && HAVE_7REGS
DECLARE_ALIGNED(8, uint64_t, tmp)[3]; DECLARE_ALIGNED(8, uint64_t, tmp)[3];
@ -1046,7 +1046,7 @@ DERING_CORE((%0, %1, 8) ,(%%FF_REGd, %1, 4),%%mm2,%%mm4,%%mm0,%%mm3,%%mm5,
for(y=0; y<10; y++){ for(y=0; y<10; y++){
int t = 0; int t = 0;
if(src[stride*y + 0] > avg) t+= 1; if(!leftborder && src[stride*y + 0] > avg) t+= 1;
if(src[stride*y + 1] > avg) t+= 2; if(src[stride*y + 1] > avg) t+= 2;
if(src[stride*y + 2] > avg) t+= 4; if(src[stride*y + 2] > avg) t+= 4;
if(src[stride*y + 3] > avg) t+= 8; if(src[stride*y + 3] > avg) t+= 8;
@ -1055,7 +1055,7 @@ DERING_CORE((%0, %1, 8) ,(%%FF_REGd, %1, 4),%%mm2,%%mm4,%%mm0,%%mm3,%%mm5,
if(src[stride*y + 6] > avg) t+= 64; if(src[stride*y + 6] > avg) t+= 64;
if(src[stride*y + 7] > avg) t+= 128; if(src[stride*y + 7] > avg) t+= 128;
if(src[stride*y + 8] > avg) t+= 256; if(src[stride*y + 8] > avg) t+= 256;
if(src[stride*y + 9] > avg) t+= 512; if(!rightborder && src[stride*y + 9] > avg) t+= 512;
t |= (~t)<<16; t |= (~t)<<16;
t &= (t<<1) & (t>>1); t &= (t<<1) & (t>>1);
@ -1072,8 +1072,8 @@ DERING_CORE((%0, %1, 8) ,(%%FF_REGd, %1, 4),%%mm2,%%mm4,%%mm0,%%mm3,%%mm5,
int x; int x;
int t = s[y-1]; int t = s[y-1];
p= src + stride*y; p= src + stride*y + leftborder;
for(x=1; x<9; x++){ for(x=1+leftborder; x<9-rightborder; x++){
p++; p++;
if(t & (1<<x)){ if(t & (1<<x)){
int f= (*(p-stride-1)) + 2*(*(p-stride)) + (*(p-stride+1)) int f= (*(p-stride-1)) + 2*(*(p-stride)) + (*(p-stride+1))
@ -3210,7 +3210,7 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[
#endif //TEMPLATE_PP_MMX #endif //TEMPLATE_PP_MMX
if(mode & DERING){ if(mode & DERING){
//FIXME filter first line //FIXME filter first line
if(y>0) RENAME(dering)(dstBlock - stride - 8, stride, c); if(y>0) RENAME(dering)(dstBlock - stride - 8, stride, c, x<=8, 0);
} }
if(mode & TEMP_NOISE_FILTER) if(mode & TEMP_NOISE_FILTER)
@ -3232,7 +3232,7 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[
} }
if(mode & DERING){ if(mode & DERING){
if(y > 0) RENAME(dering)(dstBlock - dstStride - 8, dstStride, c); if(y > 0) RENAME(dering)(dstBlock - dstStride - 8, dstStride, c, 0, 1);
} }
if((mode & TEMP_NOISE_FILTER)){ if((mode & TEMP_NOISE_FILTER)){