PR #23011 opened by mkver URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23011 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23011.patch
>From 51a5a874c2812f1402875e44d5431158e1b5f44d Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt <[email protected]> Date: Wed, 24 Dec 2025 13:30:08 +0100 Subject: [PATCH 1/3] avcodec/x86/vc1dsp_loopfilter: Remove MMXEXT funcs overridden by SSSE3 Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/x86/vc1dsp_init.c | 3 --- libavcodec/x86/vc1dsp_loopfilter.asm | 14 -------------- 2 files changed, 17 deletions(-) diff --git a/libavcodec/x86/vc1dsp_init.c b/libavcodec/x86/vc1dsp_init.c index e344f233de..9f80048791 100644 --- a/libavcodec/x86/vc1dsp_init.c +++ b/libavcodec/x86/vc1dsp_init.c @@ -52,7 +52,6 @@ static void vc1_h_loop_filter16_ ## EXT(uint8_t *src, ptrdiff_t stride, int pq) ff_vc1_h_loop_filter8_ ## EXT(src+8*stride, stride, pq); \ } -LOOP_FILTER4(mmxext) LOOP_FILTER816(sse2) LOOP_FILTER4(ssse3) LOOP_FILTER816(ssse3) @@ -115,8 +114,6 @@ av_cold void ff_vc1dsp_init_x86(VC1DSPContext *dsp) dsp->vc1_h_loop_filter16 = vc1_h_loop_filter16_ ## EXT if (EXTERNAL_MMXEXT(cpu_flags)) { - ASSIGN_LF4(mmxext); - dsp->avg_vc1_mspel_pixels_tab[1][0] = avg_vc1_mspel_mc00_8_mmxext; dsp->vc1_inv_trans_8x8_dc = ff_vc1_inv_trans_8x8_dc_mmxext; diff --git a/libavcodec/x86/vc1dsp_loopfilter.asm b/libavcodec/x86/vc1dsp_loopfilter.asm index 49f67255cd..f1367da5fa 100644 --- a/libavcodec/x86/vc1dsp_loopfilter.asm +++ b/libavcodec/x86/vc1dsp_loopfilter.asm @@ -228,20 +228,6 @@ SECTION .text imul r2, 0x01010101 %endmacro -; void ff_vc1_v_loop_filter4_mmxext(uint8_t *src, ptrdiff_t stride, int pq) -INIT_MMX mmxext -cglobal vc1_v_loop_filter4, 3,5,0 - START_V_FILTER - VC1_V_LOOP_FILTER 4, d - RET - -; void ff_vc1_h_loop_filter4_mmxext(uint8_t *src, ptrdiff_t stride, int pq) -INIT_MMX mmxext -cglobal vc1_h_loop_filter4, 3,5,0 - START_H_FILTER 4 - VC1_H_LOOP_FILTER 4, r4 - RET - INIT_XMM sse2 ; void ff_vc1_v_loop_filter8_sse2(uint8_t *src, ptrdiff_t stride, int pq) cglobal vc1_v_loop_filter8, 3,5,8 -- 2.52.0 >From e631fcb597c01e75c54c6e82a16bd67fdcb5c899 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt <[email protected]> Date: Mon, 4 May 2026 15:30:19 +0200 Subject: [PATCH 2/3] avcodec/x86/vp6dsp_init: Update obsolete comment Forgotten in 6cb3ee80b3b58d692a722fb38ee05f170ae8b0d2. Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/x86/vp6dsp_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/x86/vp6dsp_init.c b/libavcodec/x86/vp6dsp_init.c index db9a95767e..b1e3ab5b7e 100644 --- a/libavcodec/x86/vp6dsp_init.c +++ b/libavcodec/x86/vp6dsp_init.c @@ -1,5 +1,5 @@ /* - * VP6 MMX/SSE2 optimizations + * VP6 SSE2 optimizations * Copyright (C) 2009 Sebastien Lucas <[email protected]> * Copyright (C) 2009 Zuxy Meng <[email protected]> * -- 2.52.0 >From 3adca3dfba4f3a871a176ef50cd83e4a58052ab4 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt <[email protected]> Date: Mon, 4 May 2026 15:32:27 +0200 Subject: [PATCH 3/3] avcodec/x86/mpegvideoenc{,_template}: Remove remnants of MMX Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/x86/mpegvideoenc.c | 2 +- libavcodec/x86/mpegvideoenc_template.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/x86/mpegvideoenc.c b/libavcodec/x86/mpegvideoenc.c index 24dd049200..f33c37eeb9 100644 --- a/libavcodec/x86/mpegvideoenc.c +++ b/libavcodec/x86/mpegvideoenc.c @@ -27,7 +27,7 @@ #include "libavcodec/avcodec.h" #include "libavcodec/mpegvideoenc.h" -/* not permutated inverse zigzag_direct + 1 for MMX quantizer */ +/* not permutated inverse zigzag_direct + 1 */ DECLARE_ALIGNED(16, static const uint16_t, inv_zigzag_direct16)[64] = { 1, 2, 6, 7, 15, 16, 28, 29, 3, 5, 8, 14, 17, 27, 30, 43, diff --git a/libavcodec/x86/mpegvideoenc_template.c b/libavcodec/x86/mpegvideoenc_template.c index d6ff4f68a0..238494e5e5 100644 --- a/libavcodec/x86/mpegvideoenc_template.c +++ b/libavcodec/x86/mpegvideoenc_template.c @@ -1,5 +1,5 @@ /* - * MPEG video MMX templates + * MPEG video DCT template * * Copyright (c) 2002 Michael Niedermayer <[email protected]> * @@ -32,7 +32,6 @@ #include "mpegvideoencdsp.h" #undef SPREADW -#undef PMAXW #undef PMAX #undef SAVE_SIGN #undef RESTORE_SIGN -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
