[FFmpeg-devel] [PATCH 1/2] avcodec/intrax8dsp: Constify DSP functions

[Andreas Rheinhardt <andreas.rheinhardt@outlook.com>]

[-- Attachment #1: Type: text/plain, Size: 16 bytes --]

Patches attached

[-- Attachment #2: 0001-avcodec-intrax8dsp-Constify-DSP-functions.patch --]
[-- Type: text/x-patch, Size: 6077 bytes --]

From 43f03dc1890d4c7f584ce3a40884f46e843a1d32 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Sun, 23 Feb 2025 20:44:48 +0100
Subject: [PATCH 1/2] avcodec/intrax8dsp: Constify DSP functions

Also add restrict where possible.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/intrax8dsp.c | 29 +++++++++++++++--------------
 libavcodec/intrax8dsp.h |  4 ++--
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/libavcodec/intrax8dsp.c b/libavcodec/intrax8dsp.c
index 80c3929f71..ff22aecae2 100644
--- a/libavcodec/intrax8dsp.c
+++ b/libavcodec/intrax8dsp.c
@@ -62,11 +62,12 @@
         note:   1|2 - mb_x==mb_y==0 - first block, use 0x80 value for all areas;
                 4   - mb_x>= (mb_width-1) last block in the row, interpolate area #5;
 -*/
-static void x8_setup_spatial_compensation(uint8_t *src, uint8_t *dst,
+static void x8_setup_spatial_compensation(const uint8_t *restrict src,
+                                                uint8_t *restrict dst,
                                           ptrdiff_t stride, int *range,
                                           int *psum, int edges)
 {
-    uint8_t *ptr;
+    const uint8_t *ptr;
     int sum;
     int i;
     int min_pix, max_pix;
@@ -160,7 +161,7 @@ static const uint16_t zero_prediction_weights[64 * 2] = {
     317,  846, 366,  731, 458,  611, 499, 499,
 };
 
-static void spatial_compensation_0(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
+static void spatial_compensation_0(const uint8_t *restrict src, uint8_t *restrict dst, ptrdiff_t stride)
 {
     int i, j;
     int x, y;
@@ -212,7 +213,7 @@ static void spatial_compensation_0(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
     }
 }
 
-static void spatial_compensation_1(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
+static void spatial_compensation_1(const uint8_t *restrict src, uint8_t *restrict dst, ptrdiff_t stride)
 {
     int x, y;
 
@@ -223,7 +224,7 @@ static void spatial_compensation_1(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
     }
 }
 
-static void spatial_compensation_2(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
+static void spatial_compensation_2(const uint8_t *restrict src, uint8_t *restrict dst, ptrdiff_t stride)
 {
     int x, y;
 
@@ -234,7 +235,7 @@ static void spatial_compensation_2(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
     }
 }
 
-static void spatial_compensation_3(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
+static void spatial_compensation_3(const uint8_t *restrict src, uint8_t *restrict dst, ptrdiff_t stride)
 {
     int x, y;
 
@@ -245,7 +246,7 @@ static void spatial_compensation_3(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
     }
 }
 
-static void spatial_compensation_4(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
+static void spatial_compensation_4(const uint8_t *restrict src, uint8_t *restrict dst, ptrdiff_t stride)
 {
     int x, y;
 
@@ -256,7 +257,7 @@ static void spatial_compensation_4(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
     }
 }
 
-static void spatial_compensation_5(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
+static void spatial_compensation_5(const uint8_t *restrict src, uint8_t *restrict dst, ptrdiff_t stride)
 {
     int x, y;
 
@@ -271,7 +272,7 @@ static void spatial_compensation_5(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
     }
 }
 
-static void spatial_compensation_6(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
+static void spatial_compensation_6(const uint8_t *restrict src, uint8_t *restrict dst, ptrdiff_t stride)
 {
     int x, y;
 
@@ -282,7 +283,7 @@ static void spatial_compensation_6(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
     }
 }
 
-static void spatial_compensation_7(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
+static void spatial_compensation_7(const uint8_t *restrict src, uint8_t *restrict dst, ptrdiff_t stride)
 {
     int x, y;
 
@@ -297,7 +298,7 @@ static void spatial_compensation_7(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
     }
 }
 
-static void spatial_compensation_8(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
+static void spatial_compensation_8(const uint8_t *restrict src, uint8_t *restrict dst, ptrdiff_t stride)
 {
     int x, y;
 
@@ -308,7 +309,7 @@ static void spatial_compensation_8(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
     }
 }
 
-static void spatial_compensation_9(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
+static void spatial_compensation_9(const uint8_t *restrict src, uint8_t *restrict dst, ptrdiff_t stride)
 {
     int x, y;
 
@@ -319,7 +320,7 @@ static void spatial_compensation_9(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
     }
 }
 
-static void spatial_compensation_10(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
+static void spatial_compensation_10(const uint8_t *restrict src, uint8_t *restrict dst, ptrdiff_t stride)
 {
     int x, y;
 
@@ -330,7 +331,7 @@ static void spatial_compensation_10(uint8_t *src, uint8_t *dst, ptrdiff_t stride
     }
 }
 
-static void spatial_compensation_11(uint8_t *src, uint8_t *dst, ptrdiff_t stride)
+static void spatial_compensation_11(const uint8_t *restrict src, uint8_t *restrict dst, ptrdiff_t stride)
 {
     int x, y;
 
diff --git a/libavcodec/intrax8dsp.h b/libavcodec/intrax8dsp.h
index bf42698ed7..6cf673c364 100644
--- a/libavcodec/intrax8dsp.h
+++ b/libavcodec/intrax8dsp.h
@@ -26,9 +26,9 @@ typedef struct IntraX8DSPContext {
     void (*v_loop_filter)(uint8_t *src, ptrdiff_t stride, int qscale);
     void (*h_loop_filter)(uint8_t *src, ptrdiff_t stride, int qscale);
 
-    void (*spatial_compensation[12])(uint8_t *src, uint8_t *dst,
+    void (*spatial_compensation[12])(const uint8_t *restrict src, uint8_t *restrict dst,
                                      ptrdiff_t stride);
-    void (*setup_spatial_compensation)(uint8_t *src, uint8_t *dst,
+    void (*setup_spatial_compensation)(const uint8_t *restrict src, uint8_t *restrict dst,
                                        ptrdiff_t stride, int *range,
                                        int *sum, int edges);
 } IntraX8DSPContext;
-- 
2.45.2


[-- Attachment #3: 0002-avcodec-intrax8dsp-Copy-several-bytes-at-once.patch --]
[-- Type: text/x-patch, Size: 2037 bytes --]

From 7908f5821efce294e149572f75d34ce3c76731ce Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Sun, 23 Feb 2025 21:32:57 +0100
Subject: [PATCH 2/2] avcodec/intrax8dsp: Copy several bytes at once

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/intrax8dsp.c | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/libavcodec/intrax8dsp.c b/libavcodec/intrax8dsp.c
index ff22aecae2..2673316369 100644
--- a/libavcodec/intrax8dsp.c
+++ b/libavcodec/intrax8dsp.c
@@ -23,6 +23,7 @@
 
 #include "intrax8dsp.h"
 #include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
 
 /*
  * area positions, #3 is 1 pixel only, other are 8 pixels
@@ -226,22 +227,16 @@ static void spatial_compensation_1(const uint8_t *restrict src, uint8_t *restric
 
 static void spatial_compensation_2(const uint8_t *restrict src, uint8_t *restrict dst, ptrdiff_t stride)
 {
-    int x, y;
-
-    for (y = 0; y < 8; y++) {
-        for (x = 0; x < 8; x++)
-            dst[x] = src[area4 + 1 + y + x];
+    for (int y = 0; y < 8; y++) {
+        AV_COPY64U(dst, src + area4 + 1 + y);
         dst += stride;
     }
 }
 
 static void spatial_compensation_3(const uint8_t *restrict src, uint8_t *restrict dst, ptrdiff_t stride)
 {
-    int x, y;
-
-    for (y = 0; y < 8; y++) {
-        for (x = 0; x < 8; x++)
-            dst[x] = src[area4 + ((y + 1) >> 1) + x];
+    for (int y = 0; y < 8; y++) {
+        AV_COPY64U(dst, src + area4 + ((y + 1) >> 1));
         dst += stride;
     }
 }
@@ -274,11 +269,8 @@ static void spatial_compensation_5(const uint8_t *restrict src, uint8_t *restric
 
 static void spatial_compensation_6(const uint8_t *restrict src, uint8_t *restrict dst, ptrdiff_t stride)
 {
-    int x, y;
-
-    for (y = 0; y < 8; y++) {
-        for (x = 0; x < 8; x++)
-            dst[x] = src[area3 + x - y];
+    for (int y = 0; y < 8; y++) {
+        AV_COPY64U(dst, src + area3 - y);
         dst += stride;
     }
 }
-- 
2.45.2


[-- Attachment #4: 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".