diff mbox series

[FFmpeg-devel,2/2] avcodec/vvc: Remove write-only assignments in alf_filter_chroma

Message ID tencent_A04DA24FC0D538A716B8941645CD1CA02A07@qq.com
State New
Headers show
Series [FFmpeg-devel,1/2] avcodec/vvc: Remove NOP condition check in alf_filter_luma | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Zhao Zhili July 16, 2024, 2:49 a.m. UTC 
From: Zhao Zhili <zhilizhao@tencent.com>

---
 libavcodec/vvc/filter_template.c | 10 ----------
 1 file changed, 10 deletions(-)

Comments

Nuo Mi July 17, 2024, 1:30 p.m. UTC | #1 
On Tue, Jul 16, 2024 at 10:50 AM Zhao Zhili <quinkblack@foxmail.com> wrote:

> From: Zhao Zhili <zhilizhao@tencent.com>
>
merged.
Thank you

>
> ---
>  libavcodec/vvc/filter_template.c | 10 ----------
>  1 file changed, 10 deletions(-)
>
> diff --git a/libavcodec/vvc/filter_template.c
> b/libavcodec/vvc/filter_template.c
> index 32777452b7..6dd7310089 100644
> --- a/libavcodec/vvc/filter_template.c
> +++ b/libavcodec/vvc/filter_template.c
> @@ -153,8 +153,6 @@ static void FUNC(alf_filter_chroma)(uint8_t* _dst,
> ptrdiff_t dst_stride, const u
>              const pixel *s2 = s0 - src_stride;
>              const pixel *s3 = s1 + src_stride;
>              const pixel *s4 = s2 - src_stride;
> -            const pixel *s5 = s3 + src_stride;
> -            const pixel *s6 = s4 - src_stride;
>
>              for (int i = 0; i < ALF_BLOCK_SIZE; i++) {
>                  pixel *dst = (pixel *)_dst + (y + i) * dst_stride + x;
> @@ -164,8 +162,6 @@ static void FUNC(alf_filter_chroma)(uint8_t* _dst,
> ptrdiff_t dst_stride, const u
>                  const pixel *p2 = s2 + i * src_stride;
>                  const pixel *p3 = s3 + i * src_stride;
>                  const pixel *p4 = s4 + i * src_stride;
> -                const pixel *p5 = s5 + i * src_stride;
> -                const pixel *p6 = s6 + i * src_stride;
>
>                  const int is_near_vb_above = (y + i <  vb_pos) && (y + i
> >= vb_pos - 1);
>                  const int is_near_vb_below = (y + i >= vb_pos) && (y + i
> <= vb_pos);
> @@ -174,19 +170,15 @@ static void FUNC(alf_filter_chroma)(uint8_t* _dst,
> ptrdiff_t dst_stride, const u
>                  if ((y + i < vb_pos) && ((y + i) >= vb_above)) {
>                      p1 = (y + i == vb_pos - 1) ? p0 : p1;
>                      p3 = (y + i >= vb_pos - 2) ? p1 : p3;
> -                    p5 = (y + i >= vb_pos - 3) ? p3 : p5;
>
>                      p2 = (y + i == vb_pos - 1) ? p0 : p2;
>                      p4 = (y + i >= vb_pos - 2) ? p2 : p4;
> -                    p6 = (y + i >= vb_pos - 3) ? p4 : p6;
>                  } else if ((y + i >= vb_pos) && ((y + i) <= vb_below)) {
>                      p2 = (y + i == vb_pos    ) ? p0 : p2;
>                      p4 = (y + i <= vb_pos + 1) ? p2 : p4;
> -                    p6 = (y + i <= vb_pos + 2) ? p4 : p6;
>
>                      p1 = (y + i == vb_pos    ) ? p0 : p1;
>                      p3 = (y + i <= vb_pos + 1) ? p1 : p3;
> -                    p5 = (y + i <= vb_pos + 2) ? p3 : p5;
>                  }
>
>                  for (int j = 0; j < ALF_BLOCK_SIZE; j++) {
> @@ -212,8 +204,6 @@ static void FUNC(alf_filter_chroma)(uint8_t* _dst,
> ptrdiff_t dst_stride, const u
>                      p2++;
>                      p3++;
>                      p4++;
> -                    p5++;
> -                    p6++;
>                  }
>              }
>          }
> --
> 2.42.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".
>
diff mbox series

Patch

diff --git a/libavcodec/vvc/filter_template.c b/libavcodec/vvc/filter_template.c
index 32777452b7..6dd7310089 100644
--- a/libavcodec/vvc/filter_template.c
+++ b/libavcodec/vvc/filter_template.c
@@ -153,8 +153,6 @@  static void FUNC(alf_filter_chroma)(uint8_t* _dst, ptrdiff_t dst_stride, const u
             const pixel *s2 = s0 - src_stride;
             const pixel *s3 = s1 + src_stride;
             const pixel *s4 = s2 - src_stride;
-            const pixel *s5 = s3 + src_stride;
-            const pixel *s6 = s4 - src_stride;
 
             for (int i = 0; i < ALF_BLOCK_SIZE; i++) {
                 pixel *dst = (pixel *)_dst + (y + i) * dst_stride + x;
@@ -164,8 +162,6 @@  static void FUNC(alf_filter_chroma)(uint8_t* _dst, ptrdiff_t dst_stride, const u
                 const pixel *p2 = s2 + i * src_stride;
                 const pixel *p3 = s3 + i * src_stride;
                 const pixel *p4 = s4 + i * src_stride;
-                const pixel *p5 = s5 + i * src_stride;
-                const pixel *p6 = s6 + i * src_stride;
 
                 const int is_near_vb_above = (y + i <  vb_pos) && (y + i >= vb_pos - 1);
                 const int is_near_vb_below = (y + i >= vb_pos) && (y + i <= vb_pos);
@@ -174,19 +170,15 @@  static void FUNC(alf_filter_chroma)(uint8_t* _dst, ptrdiff_t dst_stride, const u
                 if ((y + i < vb_pos) && ((y + i) >= vb_above)) {
                     p1 = (y + i == vb_pos - 1) ? p0 : p1;
                     p3 = (y + i >= vb_pos - 2) ? p1 : p3;
-                    p5 = (y + i >= vb_pos - 3) ? p3 : p5;
 
                     p2 = (y + i == vb_pos - 1) ? p0 : p2;
                     p4 = (y + i >= vb_pos - 2) ? p2 : p4;
-                    p6 = (y + i >= vb_pos - 3) ? p4 : p6;
                 } else if ((y + i >= vb_pos) && ((y + i) <= vb_below)) {
                     p2 = (y + i == vb_pos    ) ? p0 : p2;
                     p4 = (y + i <= vb_pos + 1) ? p2 : p4;
-                    p6 = (y + i <= vb_pos + 2) ? p4 : p6;
 
                     p1 = (y + i == vb_pos    ) ? p0 : p1;
                     p3 = (y + i <= vb_pos + 1) ? p1 : p3;
-                    p5 = (y + i <= vb_pos + 2) ? p3 : p5;
                 }
 
                 for (int j = 0; j < ALF_BLOCK_SIZE; j++) {
@@ -212,8 +204,6 @@  static void FUNC(alf_filter_chroma)(uint8_t* _dst, ptrdiff_t dst_stride, const u
                     p2++;
                     p3++;
                     p4++;
-                    p5++;
-                    p6++;
                 }
             }
         }