From: Shiyou Yin <yinshiyou-hf@loongson.cn>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH] swscale: [loongarch] Fix checkasm-sw_yuv2rgb failure.
Date: Thu, 25 Jul 2024 17:39:21 +0800
Message-ID: <20240725093921.2991-1-yinshiyou-hf@loongson.cn> (raw)
---
libswscale/loongarch/swscale_init_loongarch.c | 104 +++++++++---------
libswscale/loongarch/yuv2rgb_lasx.c | 4 +-
2 files changed, 56 insertions(+), 52 deletions(-)
diff --git a/libswscale/loongarch/swscale_init_loongarch.c b/libswscale/loongarch/swscale_init_loongarch.c
index 4af62ad9f8..2a95ede6d9 100644
--- a/libswscale/loongarch/swscale_init_loongarch.c
+++ b/libswscale/loongarch/swscale_init_loongarch.c
@@ -112,60 +112,64 @@ av_cold SwsFunc ff_yuv2rgb_init_loongarch(SwsContext *c)
int cpu_flags = av_get_cpu_flags();
#if HAVE_LASX
if (have_lasx(cpu_flags)) {
- switch (c->dstFormat) {
- case AV_PIX_FMT_RGB24:
- return yuv420_rgb24_lasx;
- case AV_PIX_FMT_BGR24:
- return yuv420_bgr24_lasx;
- case AV_PIX_FMT_RGBA:
- if (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat)) {
- break;
- } else
- return yuv420_rgba32_lasx;
- case AV_PIX_FMT_ARGB:
- if (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat)) {
- break;
- } else
- return yuv420_argb32_lasx;
- case AV_PIX_FMT_BGRA:
- if (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat)) {
- break;
- } else
- return yuv420_bgra32_lasx;
- case AV_PIX_FMT_ABGR:
- if (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat)) {
- break;
- } else
- return yuv420_abgr32_lasx;
+ if (c->srcFormat == AV_PIX_FMT_YUV420P) {
+ switch (c->dstFormat) {
+ case AV_PIX_FMT_RGB24:
+ return yuv420_rgb24_lasx;
+ case AV_PIX_FMT_BGR24:
+ return yuv420_bgr24_lasx;
+ case AV_PIX_FMT_RGBA:
+ if (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat)) {
+ break;
+ } else
+ return yuv420_rgba32_lasx;
+ case AV_PIX_FMT_ARGB:
+ if (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat)) {
+ break;
+ } else
+ return yuv420_argb32_lasx;
+ case AV_PIX_FMT_BGRA:
+ if (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat)) {
+ break;
+ } else
+ return yuv420_bgra32_lasx;
+ case AV_PIX_FMT_ABGR:
+ if (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat)) {
+ break;
+ } else
+ return yuv420_abgr32_lasx;
+ }
}
}
#endif // #if HAVE_LASX
if (have_lsx(cpu_flags)) {
- switch (c->dstFormat) {
- case AV_PIX_FMT_RGB24:
- return yuv420_rgb24_lsx;
- case AV_PIX_FMT_BGR24:
- return yuv420_bgr24_lsx;
- case AV_PIX_FMT_RGBA:
- if (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat)) {
- break;
- } else
- return yuv420_rgba32_lsx;
- case AV_PIX_FMT_ARGB:
- if (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat)) {
- break;
- } else
- return yuv420_argb32_lsx;
- case AV_PIX_FMT_BGRA:
- if (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat)) {
- break;
- } else
- return yuv420_bgra32_lsx;
- case AV_PIX_FMT_ABGR:
- if (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat)) {
- break;
- } else
- return yuv420_abgr32_lsx;
+ if (c->srcFormat == AV_PIX_FMT_YUV420P) {
+ switch (c->dstFormat) {
+ case AV_PIX_FMT_RGB24:
+ return yuv420_rgb24_lsx;
+ case AV_PIX_FMT_BGR24:
+ return yuv420_bgr24_lsx;
+ case AV_PIX_FMT_RGBA:
+ if (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat)) {
+ break;
+ } else
+ return yuv420_rgba32_lsx;
+ case AV_PIX_FMT_ARGB:
+ if (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat)) {
+ break;
+ } else
+ return yuv420_argb32_lsx;
+ case AV_PIX_FMT_BGRA:
+ if (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat)) {
+ break;
+ } else
+ return yuv420_bgra32_lsx;
+ case AV_PIX_FMT_ABGR:
+ if (CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat)) {
+ break;
+ } else
+ return yuv420_abgr32_lsx;
+ }
}
}
return NULL;
diff --git a/libswscale/loongarch/yuv2rgb_lasx.c b/libswscale/loongarch/yuv2rgb_lasx.c
index 64e434f50c..0ce553005a 100644
--- a/libswscale/loongarch/yuv2rgb_lasx.c
+++ b/libswscale/loongarch/yuv2rgb_lasx.c
@@ -82,8 +82,8 @@
#define YUV2RGB_RES \
m_y1 = __lasx_xvldrepl_d(py_1, 0); \
m_y2 = __lasx_xvldrepl_d(py_2, 0); \
- m_u = __lasx_xvldrepl_d(pu, 0); \
- m_v = __lasx_xvldrepl_d(pv, 0); \
+ m_u = __lasx_xvldrepl_w(pu, 0); \
+ m_v = __lasx_xvldrepl_w(pv, 0); \
m_y1 = __lasx_xvilvl_d(m_y2, m_y1); \
m_u = __lasx_xvilvl_b(m_u, m_u); \
m_v = __lasx_xvilvl_b(m_v, m_v); \
--
2.20.1
_______________________________________________
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".
next reply other threads:[~2024-07-25 9:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-25 9:39 Shiyou Yin [this message]
2024-07-25 10:01 ` 陈昊
2024-07-27 22:12 ` Michael Niedermayer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240725093921.2991-1-yinshiyou-hf@loongson.cn \
--to=yinshiyou-hf@loongson.cn \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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