| Message ID | 20220817092039.1153783-1-alankelly@google.com |
|---|---|
| State | Accepted |
| Commit | 51a34e8525fea2bbc29b42831d7a17f34e8518d3 |
| Headers | show |
| Series | [FFmpeg-devel] sws: Replace call to yuv2yuvX_mmx by yuv2yuvX_mmxext | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Alan Kelly: > --- > Remove yuv2yuvX_mmx as it is no longer used. > libswscale/x86/swscale.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c > index 32d441245d..89ef9f5d2b 100644 > --- a/libswscale/x86/swscale.c > +++ b/libswscale/x86/swscale.c > @@ -205,20 +205,17 @@ static void yuv2yuvX_ ##opt(const int16_t *filter, int filterSize, \ > int remainder = (dstW % step); \ > int pixelsProcessed = dstW - remainder; \ > if(((uintptr_t)dest) & 15){ \ > - yuv2yuvX_mmx(filter, filterSize, src, dest, dstW, dither, offset); \ > + yuv2yuvX_mmxext(filter, filterSize, src, dest, dstW, dither, offset); \ > return; \ > } \ > if(pixelsProcessed > 0) \ > ff_yuv2yuvX_ ##opt(filter, filterSize - 1, 0, dest - offset, pixelsProcessed + offset, dither, offset); \ > if(remainder > 0){ \ > - ff_yuv2yuvX_mmx(filter, filterSize - 1, pixelsProcessed, dest - offset, pixelsProcessed + remainder + offset, dither, offset); \ > + ff_yuv2yuvX_mmxext(filter, filterSize - 1, pixelsProcessed, dest - offset, pixelsProcessed + remainder + offset, dither, offset); \ > } \ > return; \ > } > > -#if HAVE_MMX_EXTERNAL > -YUV2YUVX_FUNC_MMX(mmx, 16) > -#endif > #if HAVE_MMXEXT_EXTERNAL > YUV2YUVX_FUNC_MMX(mmxext, 16) > #endif Thanks. I'll apply this tonight unless someone else has objections. - Andreas
diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 32d441245d..89ef9f5d2b 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -205,20 +205,17 @@ static void yuv2yuvX_ ##opt(const int16_t *filter, int filterSize, \ int remainder = (dstW % step); \ int pixelsProcessed = dstW - remainder; \ if(((uintptr_t)dest) & 15){ \ - yuv2yuvX_mmx(filter, filterSize, src, dest, dstW, dither, offset); \ + yuv2yuvX_mmxext(filter, filterSize, src, dest, dstW, dither, offset); \ return; \ } \ if(pixelsProcessed > 0) \ ff_yuv2yuvX_ ##opt(filter, filterSize - 1, 0, dest - offset, pixelsProcessed + offset, dither, offset); \ if(remainder > 0){ \ - ff_yuv2yuvX_mmx(filter, filterSize - 1, pixelsProcessed, dest - offset, pixelsProcessed + remainder + offset, dither, offset); \ + ff_yuv2yuvX_mmxext(filter, filterSize - 1, pixelsProcessed, dest - offset, pixelsProcessed + remainder + offset, dither, offset); \ } \ return; \ } -#if HAVE_MMX_EXTERNAL -YUV2YUVX_FUNC_MMX(mmx, 16) -#endif #if HAVE_MMXEXT_EXTERNAL YUV2YUVX_FUNC_MMX(mmxext, 16) #endif