[FFmpeg-devel] [PATCH] postproc/postprocess_template: Fix reading uninitialized pixels in dering_C()

[FFmpeg-devel] [PATCH] postproc/postprocess_template: Fix reading uninitialized pixels in dering_C()

[Michael Niedermayer]

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libpostproc/postprocess_template.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c
index f0e3c50d88c..05735433adb 100644
--- a/libpostproc/postprocess_template.c
+++ b/libpostproc/postprocess_template.c
@@ -831,7 +831,7 @@ static inline void RENAME(doVertDefFilter)(uint8_t src[], int stride, PPContext
 #endif //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 border)
 {
 #if TEMPLATE_PP_MMXEXT && HAVE_7REGS
     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++){
         int t = 0;
 
-        if(src[stride*y + 0] > avg) t+= 1;
+        if(!border && src[stride*y + 0] > avg) t+= 1;
         if(src[stride*y + 1] > avg) t+= 2;
         if(src[stride*y + 2] > avg) t+= 4;
         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 + 7] > avg) t+= 128;
         if(src[stride*y + 8] > avg) t+= 256;
-        if(src[stride*y + 9] > avg) t+= 512;
+        if(!border && src[stride*y + 9] > avg) t+= 512;
 
         t |= (~t)<<16;
         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 t = s[y-1];
 
-        p= src + stride*y;
-        for(x=1; x<9; x++){
+        p= src + stride*y + border;
+        for(x=1+border; x<9-border; x++){
             p++;
             if(t & (1<<x)){
                 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
                 if(mode & DERING){
                 //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);
                 }
 
                 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(y > 0) RENAME(dering)(dstBlock - dstStride - 8, dstStride, c);
+            if(y > 0) RENAME(dering)(dstBlock - dstStride - 8, dstStride, c, 1);
         }
 
         if((mode & TEMP_NOISE_FILTER)){
-- 
2.49.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] postproc/postprocess_template: Fix reading uninitialized pixels in dering_C()

[Kieran Kunhya via ffmpeg-devel]

On Tue, 22 Apr 2025, 00:44 Michael Niedermayer, <michael@niedermayer.cc>
wrote:

> Sponsored-by: Sovereign Tech Fund
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
>

I thought we decided postproc work in STF wasn't going to happen?

Note that the STF wiki doesn't mention anything about bugfixes to
libpostproc.

Kieran

>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] postproc/postprocess_template: Fix reading uninitialized pixels in dering_C()

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 1376 bytes --]

Hi Kieran

On Tue, Apr 22, 2025 at 01:23:19AM -0100, Kieran Kunhya via ffmpeg-devel wrote:
> On Tue, 22 Apr 2025, 00:44 Michael Niedermayer, <michael@niedermayer.cc>
> wrote:
> 
> > Sponsored-by: Sovereign Tech Fund
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> >
> 
> I thought we decided postproc work in STF wasn't going to happen?

I thought i am going to do the work for the 2 remaining milestones
and I will donate the money for these 2 milestones to FFmpeg.
I thought everyone was happy with that.

If the FFmpeg community prefers, we can explore the posibility to
change the contracts to remove the postproc work.
This would mean that i will do the work exactly the same way
and FFmpeg would then get nothing.
Also iam not sure how STF would see this if we told them that
we will do the work but want it taken out of the contract so we
receive no money for it.


> 
> Note that the STF wiki doesn't mention anything about bugfixes to
> libpostproc.

The bugfix was required for blocktest to work. And teh wiki lists
"Have functioning build and selftest systems"

But ive removed the "Sponsored-by: Sovereign Tech Fund" from the
commit message.

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

He who knows, does not speak. He who speaks, does not know. -- Lao Tsu

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".