From: Philip Langdale <philipl@overt.org>
To: ffmpeg-devel@ffmpeg.org
Cc: Philip Langdale <philipl@overt.org>
Subject: [FFmpeg-devel] [PATCH 4/4] swscale/input: add support for Y212LE
Date: Sun, 4 Sep 2022 22:14:30 -0700
Message-ID: <20220905051430.218289-5-philipl@overt.org> (raw)
In-Reply-To: <20220905051430.218289-1-philipl@overt.org>
Signed-off-by: Philip Langdale <philipl@overt.org>
---
libswscale/input.c | 45 ++++++++++++++++++++++++++++++---------------
libswscale/utils.c | 1 +
2 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/libswscale/input.c b/libswscale/input.c
index f4f08c8f72..be8f3940e1 100644
--- a/libswscale/input.c
+++ b/libswscale/input.c
@@ -559,23 +559,32 @@ static void yvy2ToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *unused0, con
av_assert1(src1 == src2);
}
-static void y210le_UV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *unused0, const uint8_t *src,
- const uint8_t *unused1, int width, uint32_t *unused2, void *opq)
-{
- int i;
- for (i = 0; i < width; i++) {
- AV_WN16(dstU + i * 2, AV_RL16(src + i * 8 + 2) >> 6);
- AV_WN16(dstV + i * 2, AV_RL16(src + i * 8 + 6) >> 6);
+#define y21xle_wrapper(bits, shift) \
+ static void y2 ## bits ## le_UV_c(uint8_t *dstU, uint8_t *dstV, \
+ const uint8_t *unused0, \
+ const uint8_t *src, \
+ const uint8_t *unused1, int width, \
+ uint32_t *unused2, void *opq) \
+ { \
+ int i; \
+ for (i = 0; i < width; i++) { \
+ AV_WN16(dstU + i * 2, AV_RL16(src + i * 8 + 2) >> shift); \
+ AV_WN16(dstV + i * 2, AV_RL16(src + i * 8 + 6) >> shift); \
+ } \
+ } \
+ \
+ static void y2 ## bits ## le_Y_c(uint8_t *dst, const uint8_t *src, \
+ const uint8_t *unused0, \
+ const uint8_t *unused1, int width, \
+ uint32_t *unused2, void *opq) \
+ { \
+ int i; \
+ for (i = 0; i < width; i++) \
+ AV_WN16(dst + i * 2, AV_RL16(src + i * 4) >> shift); \
}
-}
-static void y210le_Y_c(uint8_t *dst, const uint8_t *src, const uint8_t *unused0,
- const uint8_t *unused1, int width, uint32_t *unused2, void *opq)
-{
- int i;
- for (i = 0; i < width; i++)
- AV_WN16(dst + i * 2, AV_RL16(src + i * 4) >> 6);
-}
+y21xle_wrapper(10, 6);
+y21xle_wrapper(12, 4);
static void bswap16Y_c(uint8_t *_dst, const uint8_t *_src, const uint8_t *unused1, const uint8_t *unused2, int width,
uint32_t *unused, void *opq)
@@ -1447,6 +1456,9 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c)
case AV_PIX_FMT_Y210LE:
c->chrToYV12 = y210le_UV_c;
break;
+ case AV_PIX_FMT_Y212LE:
+ c->chrToYV12 = y212le_UV_c;
+ break;
}
if (c->chrSrcHSubSample) {
switch (srcFormat) {
@@ -1932,6 +1944,9 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c)
case AV_PIX_FMT_Y210LE:
c->lumToYV12 = y210le_Y_c;
break;
+ case AV_PIX_FMT_Y212LE:
+ c->lumToYV12 = y212le_Y_c;
+ break;
case AV_PIX_FMT_X2RGB10LE:
c->lumToYV12 = rgb30leToY_c;
break;
diff --git a/libswscale/utils.c b/libswscale/utils.c
index ab86037cd4..a5a9bc589a 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -249,6 +249,7 @@ static const FormatEntry format_entries[] = {
[AV_PIX_FMT_NV24] = { 1, 1 },
[AV_PIX_FMT_NV42] = { 1, 1 },
[AV_PIX_FMT_Y210LE] = { 1, 0 },
+ [AV_PIX_FMT_Y212LE] = { 1, 0 },
[AV_PIX_FMT_X2RGB10LE] = { 1, 1 },
[AV_PIX_FMT_X2BGR10LE] = { 1, 1 },
[AV_PIX_FMT_P210BE] = { 1, 1 },
--
2.34.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".
prev parent reply other threads:[~2022-09-05 5:15 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-05 5:14 [FFmpeg-devel] [PATCH 0/4] swscale/input: Add support for new VAAPI formats Philip Langdale
2022-09-05 5:14 ` [FFmpeg-devel] [PATCH 1/4] swscale/input: add support for XV36LE Philip Langdale
2022-09-05 8:40 ` Xiang, Haihao
2022-09-05 18:07 ` Philip Langdale
2022-09-05 5:14 ` [FFmpeg-devel] [PATCH 2/4] swscale/input: add support for P012 Philip Langdale
2022-09-05 5:14 ` [FFmpeg-devel] [PATCH 3/4] swscale/input: add support for XV30LE Philip Langdale
2022-09-05 5:14 ` Philip Langdale [this message]
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=20220905051430.218289-5-philipl@overt.org \
--to=philipl@overt.org \
--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