[FFmpeg-cvslog] avcodec/x86/diracdsp_init: Reuse macro

Andreas Rheinhardt git at videolan.org
Wed Feb 24 11:19:06 EET 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Fri Feb 19 01:50:40 2021 +0100| [7825cc392a2febbe91a1321a522dbdaa49048ae7] | committer: Andreas Rheinhardt

avcodec/x86/diracdsp_init: Reuse macro

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7825cc392a2febbe91a1321a522dbdaa49048ae7
---

 libavcodec/x86/diracdsp_init.c | 38 ++------------------------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

diff --git a/libavcodec/x86/diracdsp_init.c b/libavcodec/x86/diracdsp_init.c
index 8633c66743..8baacf3129 100644
--- a/libavcodec/x86/diracdsp_init.c
+++ b/libavcodec/x86/diracdsp_init.c
@@ -91,42 +91,8 @@ DIRAC_PIXOP(put, mmx)
 DIRAC_PIXOP(avg, mmx)
 DIRAC_PIXOP(avg, mmxext)
 
-static void put_dirac_pixels16_sse2(uint8_t *dst, const uint8_t *src[5],
-                                    int stride, int h)
-{
-    if (h&3)
-        ff_put_dirac_pixels16_c(dst, src, stride, h);
-    else
-        ff_put_pixels16_sse2(dst, src[0], stride, h);
-}
-static void avg_dirac_pixels16_sse2(uint8_t *dst, const uint8_t *src[5],
-                                    int stride, int h)
-{
-    if (h&3)
-        ff_avg_dirac_pixels16_c(dst, src, stride, h);
-    else
-        ff_avg_pixels16_sse2(dst, src[0], stride, h);
-}
-static void put_dirac_pixels32_sse2(uint8_t *dst, const uint8_t *src[5],
-                                    int stride, int h)
-{
-    if (h&3) {
-        ff_put_dirac_pixels32_c(dst, src, stride, h);
-    } else {
-        ff_put_pixels16_sse2(dst   , src[0]   , stride, h);
-        ff_put_pixels16_sse2(dst+16, src[0]+16, stride, h);
-    }
-}
-static void avg_dirac_pixels32_sse2(uint8_t *dst, const uint8_t *src[5],
-                                    int stride, int h)
-{
-    if (h&3) {
-        ff_avg_dirac_pixels32_c(dst, src, stride, h);
-    } else {
-        ff_avg_pixels16_sse2(dst   , src[0]   , stride, h);
-        ff_avg_pixels16_sse2(dst+16, src[0]+16, stride, h);
-    }
-}
+DIRAC_PIXOP(put, sse2)
+DIRAC_PIXOP(avg, sse2)
 
 #if !ARCH_X86_64
 HPEL_FILTER(8, mmx)



More information about the ffmpeg-cvslog mailing list