* [FFmpeg-devel] [PATCH 1/3] swscale/x86/swscale: Process yuv2yuvX tails using next largest register size
@ 2023-07-14 10:08 Alan Kelly
2023-09-04 12:30 ` Alan Kelly via ffmpeg-devel
0 siblings, 1 reply; 4+ messages in thread
From: Alan Kelly @ 2023-07-14 10:08 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Alan Kelly
---
libswscale/x86/swscale.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c
index ff16398988..8c67bf4fab 100644
--- a/libswscale/x86/swscale.c
+++ b/libswscale/x86/swscale.c
@@ -194,7 +194,7 @@ static void yuv2yuvX_ ##opt(const int16_t *filter, int filterSize, \
return; \
}
-#define YUV2YUVX_FUNC(opt, step) \
+#define YUV2YUVX_FUNC(opt, step, tail) \
void ff_yuv2yuvX_ ##opt(const int16_t *filter, int filterSize, int srcOffset, \
uint8_t *dest, int dstW, \
const uint8_t *dither, int offset); \
@@ -211,7 +211,7 @@ static void yuv2yuvX_ ##opt(const int16_t *filter, int filterSize, \
if(pixelsProcessed > 0) \
ff_yuv2yuvX_ ##opt(filter, filterSize - 1, 0, dest - offset, pixelsProcessed + offset, dither, offset); \
if(remainder > 0){ \
- ff_yuv2yuvX_mmxext(filter, filterSize - 1, pixelsProcessed, dest - offset, pixelsProcessed + remainder + offset, dither, offset); \
+ yuv2yuvX_ ##tail(filter, filterSize, src, dest, dstW, dither, offset); \
} \
return; \
}
@@ -220,10 +220,10 @@ static void yuv2yuvX_ ##opt(const int16_t *filter, int filterSize, \
YUV2YUVX_FUNC_MMX(mmxext, 16)
#endif
#if HAVE_SSE3_EXTERNAL
-YUV2YUVX_FUNC(sse3, 32)
+YUV2YUVX_FUNC(sse3, 32, mmxext)
#endif
#if HAVE_AVX2_EXTERNAL
-YUV2YUVX_FUNC(avx2, 64)
+YUV2YUVX_FUNC(avx2, 64, sse3)
#endif
#define SCALE_FUNC(filter_n, from_bpc, to_bpc, opt) \
--
2.41.0.255.g8b1d071c50-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] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/3] swscale/x86/swscale: Process yuv2yuvX tails using next largest register size
2023-07-14 10:08 [FFmpeg-devel] [PATCH 1/3] swscale/x86/swscale: Process yuv2yuvX tails using next largest register size Alan Kelly
@ 2023-09-04 12:30 ` Alan Kelly via ffmpeg-devel
2023-09-04 22:03 ` Michael Niedermayer
0 siblings, 1 reply; 4+ messages in thread
From: Alan Kelly via ffmpeg-devel @ 2023-09-04 12:30 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Alan Kelly
Hi,
Any issues with this patch or can it be merged?
Thanks,
Alan
On Fri, Jul 14, 2023 at 12:08 PM Alan Kelly <alankelly@google.com> wrote:
> ---
> libswscale/x86/swscale.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c
> index ff16398988..8c67bf4fab 100644
> --- a/libswscale/x86/swscale.c
> +++ b/libswscale/x86/swscale.c
> @@ -194,7 +194,7 @@ static void yuv2yuvX_ ##opt(const int16_t *filter, int
> filterSize, \
> return; \
> }
>
> -#define YUV2YUVX_FUNC(opt, step) \
> +#define YUV2YUVX_FUNC(opt, step, tail) \
> void ff_yuv2yuvX_ ##opt(const int16_t *filter, int filterSize, int
> srcOffset, \
> uint8_t *dest, int dstW, \
> const uint8_t *dither, int offset); \
> @@ -211,7 +211,7 @@ static void yuv2yuvX_ ##opt(const int16_t *filter, int
> filterSize, \
> if(pixelsProcessed > 0) \
> ff_yuv2yuvX_ ##opt(filter, filterSize - 1, 0, dest - offset,
> pixelsProcessed + offset, dither, offset); \
> if(remainder > 0){ \
> - ff_yuv2yuvX_mmxext(filter, filterSize - 1, pixelsProcessed, dest -
> offset, pixelsProcessed + remainder + offset, dither, offset); \
> + yuv2yuvX_ ##tail(filter, filterSize, src, dest, dstW, dither,
> offset); \
> } \
> return; \
> }
> @@ -220,10 +220,10 @@ static void yuv2yuvX_ ##opt(const int16_t *filter,
> int filterSize, \
> YUV2YUVX_FUNC_MMX(mmxext, 16)
> #endif
> #if HAVE_SSE3_EXTERNAL
> -YUV2YUVX_FUNC(sse3, 32)
> +YUV2YUVX_FUNC(sse3, 32, mmxext)
> #endif
> #if HAVE_AVX2_EXTERNAL
> -YUV2YUVX_FUNC(avx2, 64)
> +YUV2YUVX_FUNC(avx2, 64, sse3)
> #endif
>
> #define SCALE_FUNC(filter_n, from_bpc, to_bpc, opt) \
> --
> 2.41.0.255.g8b1d071c50-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] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/3] swscale/x86/swscale: Process yuv2yuvX tails using next largest register size
2023-09-04 12:30 ` Alan Kelly via ffmpeg-devel
@ 2023-09-04 22:03 ` Michael Niedermayer
2023-09-06 14:26 ` Alan Kelly via ffmpeg-devel
0 siblings, 1 reply; 4+ messages in thread
From: Michael Niedermayer @ 2023-09-04 22:03 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1.1: Type: text/plain, Size: 391 bytes --]
On Mon, Sep 04, 2023 at 02:30:00PM +0200, Alan Kelly via ffmpeg-devel wrote:
> Hi,
>
> Any issues with this patch or can it be merged?
are all cases covered by tests ?
if yes and the tests pass, it should be ok
thx
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Observe your enemies, for they first find out your faults. -- Antisthenes
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/3] swscale/x86/swscale: Process yuv2yuvX tails using next largest register size
2023-09-04 22:03 ` Michael Niedermayer
@ 2023-09-06 14:26 ` Alan Kelly via ffmpeg-devel
0 siblings, 0 replies; 4+ messages in thread
From: Alan Kelly via ffmpeg-devel @ 2023-09-06 14:26 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Alan Kelly
On Tue, Sep 5, 2023 at 12:03 AM Michael Niedermayer <michael@niedermayer.cc>
wrote:
> On Mon, Sep 04, 2023 at 02:30:00PM +0200, Alan Kelly via ffmpeg-devel
> wrote:
> > Hi,
> >
> > Any issues with this patch or can it be merged?
>
> are all cases covered by tests ?
> if yes and the tests pass, it should be ok
>
> thx
>
> [...]
> --
> Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> Observe your enemies, for they first find out your faults. -- Antisthenes
> _______________________________________________
> 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".
>
All branches are tested. However, the third patch in this chain supersedes
this change since each version of yuv2yuvX now handles remainders. I have
sent the two other patches as a new chain so let's abandon this. 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] 4+ messages in thread
end of thread, other threads:[~2023-09-06 14:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-14 10:08 [FFmpeg-devel] [PATCH 1/3] swscale/x86/swscale: Process yuv2yuvX tails using next largest register size Alan Kelly
2023-09-04 12:30 ` Alan Kelly via ffmpeg-devel
2023-09-04 22:03 ` Michael Niedermayer
2023-09-06 14:26 ` Alan Kelly via ffmpeg-devel
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