* [FFmpeg-devel] [PATCH] x86/swscale: fix minor coding style issues
@ 2021-12-16 16:05 Alan Kelly
2021-12-16 16:09 ` Alan Kelly
2021-12-16 16:16 ` James Almer
0 siblings, 2 replies; 3+ messages in thread
From: Alan Kelly @ 2021-12-16 16:05 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Alan Kelly
---
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]));
--
2.34.1.173.g76aa8bc2d0-goog
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [FFmpeg-devel] [PATCH] x86/swscale: fix minor coding style issues
2021-12-16 16:05 [FFmpeg-devel] [PATCH] x86/swscale: fix minor coding style issues Alan Kelly
@ 2021-12-16 16:09 ` Alan Kelly
2021-12-16 16:16 ` James Almer
1 sibling, 0 replies; 3+ messages in thread
From: Alan Kelly @ 2021-12-16 16:09 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Thanks Lynne for the patch.
On Thu, Dec 16, 2021 at 5:05 PM Alan Kelly <alankelly@google.com> wrote:
> ---
> 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]));
> --
> 2.34.1.173.g76aa8bc2d0-goog
>
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [FFmpeg-devel] [PATCH] x86/swscale: fix minor coding style issues
2021-12-16 16:05 [FFmpeg-devel] [PATCH] x86/swscale: fix minor coding style issues Alan Kelly
2021-12-16 16:09 ` Alan Kelly
@ 2021-12-16 16:16 ` James Almer
1 sibling, 0 replies; 3+ messages in thread
From: James Almer @ 2021-12-16 16:16 UTC (permalink / raw)
To: ffmpeg-devel
On 12/16/2021 1:05 PM, Alan Kelly wrote:
> ---
> 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]));
Applied, thanks.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-16 16:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-16 16:05 [FFmpeg-devel] [PATCH] x86/swscale: fix minor coding style issues Alan Kelly
2021-12-16 16:09 ` Alan Kelly
2021-12-16 16:16 ` James Almer
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git