diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-06-11 18:50:44 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-06-22 13:36:18 +0200 |
| commit | 81d347203166a37b605920873ca2b8f19473ff3f (patch) | |
| tree | 7aa42d6f6ea9944ec81451e195f02ffd9b5a6890 /libswscale | |
| parent | a05f22eaf393177b94432431c145cbc5ba10390a (diff) | |
swscale/x86/swscale: Simplify macro
This is possible now that it is no longer used by MMX.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/x86/swscale.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 97bbc4f2d0..628f12137c 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -507,12 +507,12 @@ switch(c->dstBpc){ \ case 9: if (!isBE(c->dstFormat)) vscalefn = ff_yuv2planeX_9_ ## opt; break; \ case 8: if ((condition_8bit) && !c->use_mmx_vfilter) vscalefn = ff_yuv2planeX_8_ ## opt; break; \ } -#define ASSIGN_VSCALE_FUNC(vscalefn, opt1, opt2, opt2chk) \ +#define ASSIGN_VSCALE_FUNC(vscalefn, opt) \ switch(c->dstBpc){ \ - case 16: if (!isBE(c->dstFormat)) vscalefn = ff_yuv2plane1_16_ ## opt1; break; \ - case 10: if (!isBE(c->dstFormat) && !isSemiPlanarYUV(c->dstFormat) && opt2chk) vscalefn = ff_yuv2plane1_10_ ## opt2; break; \ - case 9: if (!isBE(c->dstFormat) && opt2chk) vscalefn = ff_yuv2plane1_9_ ## opt2; break; \ - case 8: vscalefn = ff_yuv2plane1_8_ ## opt1; break; \ + case 16: if (!isBE(c->dstFormat)) vscalefn = ff_yuv2plane1_16_ ## opt; break; \ + case 10: if (!isBE(c->dstFormat) && !isSemiPlanarYUV(c->dstFormat)) vscalefn = ff_yuv2plane1_10_ ## opt; break; \ + case 9: if (!isBE(c->dstFormat)) vscalefn = ff_yuv2plane1_9_ ## opt; break; \ + case 8: vscalefn = ff_yuv2plane1_8_ ## opt; break; \ default: av_assert0(c->dstBpc>8); \ } #define case_rgb(x, X, opt) \ @@ -534,7 +534,7 @@ switch(c->dstBpc){ \ ASSIGN_SSE_SCALE_FUNC(c->hcScale, c->hChrFilterSize, sse2, sse2); ASSIGN_VSCALEX_FUNC(c->yuv2planeX, sse2, , HAVE_ALIGNED_STACK || ARCH_X86_64); - ASSIGN_VSCALE_FUNC(c->yuv2plane1, sse2, sse2, 1); + ASSIGN_VSCALE_FUNC(c->yuv2plane1, sse2); switch (c->srcFormat) { case AV_PIX_FMT_YA8: @@ -590,7 +590,7 @@ switch(c->dstBpc){ \ if (EXTERNAL_AVX(cpu_flags)) { ASSIGN_VSCALEX_FUNC(c->yuv2planeX, avx, , HAVE_ALIGNED_STACK || ARCH_X86_64); - ASSIGN_VSCALE_FUNC(c->yuv2plane1, avx, avx, 1); + ASSIGN_VSCALE_FUNC(c->yuv2plane1, avx); switch (c->srcFormat) { case AV_PIX_FMT_YUYV422: |