[FFmpeg-cvslog] x86/swscale: fix minor coding style issues
Alan Kelly
git at videolan.org
Thu Dec 16 18:16:30 EET 2021
ffmpeg | branch: master | Alan Kelly <alankelly at google.com> | Thu Dec 16 17:05:48 2021 +0100| [86663963e6419a127cf52a03758855f4f8f8689f] | committer: James Almer
x86/swscale: fix minor coding style issues
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=86663963e6419a127cf52a03758855f4f8f8689f
---
libswscale/x86/swscale.c | 14 +++++++-------
tests/checkasm/sw_scale.c | 3 +--
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c
index 164b06d6ba..c49a05c37b 100644
--- a/libswscale/x86/swscale.c
+++ b/libswscale/x86/swscale.c
@@ -578,13 +578,13 @@ switch(c->dstBpc){ \
break; \
}
- if (EXTERNAL_AVX2_FAST(cpu_flags)){
- if ((c->srcBpc == 8) && (c->dstBpc <= 14)){
- if(c->chrDstW % 16 == 0)
- ASSIGN_AVX2_SCALE_FUNC(c->hcScale, c->hChrFilterSize);
- if(c->dstW % 16 == 0)
- ASSIGN_AVX2_SCALE_FUNC(c->hyScale, c->hLumFilterSize);
- }
+ if (EXTERNAL_AVX2_FAST(cpu_flags)) {
+ if ((c->srcBpc == 8) && (c->dstBpc <= 14)) {
+ if (c->chrDstW % 16 == 0)
+ ASSIGN_AVX2_SCALE_FUNC(c->hcScale, c->hChrFilterSize);
+ if (c->dstW % 16 == 0)
+ ASSIGN_AVX2_SCALE_FUNC(c->hyScale, c->hLumFilterSize);
+ }
}
if (EXTERNAL_AVX2_FAST(cpu_flags)) {
diff --git a/tests/checkasm/sw_scale.c b/tests/checkasm/sw_scale.c
index 011cb46428..f4912e6c2c 100644
--- a/tests/checkasm/sw_scale.c
+++ b/tests/checkasm/sw_scale.c
@@ -217,9 +217,8 @@ static void check_hscale(void)
}
ff_sws_init_scale(ctx);
memcpy(filterAvx2, filter, sizeof(uint16_t) * (SRC_PIXELS * MAX_FILTER_WIDTH + MAX_FILTER_WIDTH));
- if (cpu_flags & AV_CPU_FLAG_AVX2){
+ if (cpu_flags & AV_CPU_FLAG_AVX2)
ff_shuffle_filter_coefficients(ctx, filterPosAvx, width, filterAvx2, SRC_PIXELS);
- }
if (check_func(ctx->hcScale, "hscale_%d_to_%d_width%d", ctx->srcBpc, ctx->dstBpc + 1, width)) {
memset(dst0, 0, SRC_PIXELS * sizeof(dst0[0]));
More information about the ffmpeg-cvslog
mailing list