From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id CD7704BDC6 for ; Wed, 5 Mar 2025 20:44:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5F4B168D6E9; Wed, 5 Mar 2025 22:44:36 +0200 (EET) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 10D6668DB14 for ; Wed, 5 Mar 2025 22:44:30 +0200 (EET) Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2fe848040b1so15034410a91.3 for ; Wed, 05 Mar 2025 12:44:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741207467; x=1741812267; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=RsAzGA4LGV961DVOSMBzZCKN88rZpAKtzc43LvoN++0=; b=LrkRLA4P/iA6d1qTgg+q/pGOR0/9iTOgh5aYUGqfOz9RPm4P1ks9mySNuctO3vN4iW uJAvmfGP/JmussNp+iZmKuUZdFbemGbTX6qVxMnktG+SRT1pS5bFS2y3mpizyywtjEva TrY+fJ1VqjTB+pxkBPZPINkLXHAKGmftoGd5ObWf2PxxrqunPxIiHt6X2jmT/tMQvu90 NyXOFe9ke3AjrS6YTyoliHpEsGwLLTQet+T9tm/UMHyj1SQdhy64paLUspUMEh9yRrdV VJHmYE/cQ36paR/LVjYXgFWk4lz9IHgSKJNwjDmIsYeFHpnRjlUy8FUjfeLkmSUavxTg QcWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741207467; x=1741812267; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RsAzGA4LGV961DVOSMBzZCKN88rZpAKtzc43LvoN++0=; b=p1ooKyzip1uLKcwxL5FZUaAQMrfiF4bqkJWTaPZy+2pr7nqCfPfEicOQCsPiHF5c+a 2bReuhZAaWfTnwCvMEoxx4L9TOtXUcpp6IdPiVs2jbXjGtD0vGO6XyiBBJVQo5+JcaBI rbJXHRVNjWU3LzvgRE/lSRvcAxF6BpEqV4RHF1TvnU5rfxPTXbAYVqkHAKqpvS1v5zvx HjpAPWtUk5CSHmezy6yve1tgrU9T72rRRndQj2hCKe8KnDNQEL/9jVNn9dfjRiI0cTFP ABDQFrrm9BmDFitneKrTtJ4G0XZ2NDgY3UgXwN0GSSR+SRhoEdEvXn04MDIdRoLQINBZ vBYQ== X-Gm-Message-State: AOJu0YzYnEjeN3cqawPuhRPwFqIWo2r4UPRPa++CQ0uZRb/d7Swrny6e dydEld0hWmMnwZ/1IS9rD2/eSilmwPkwRWA/sdpqkNavjiYHrTOXB0ICrQ== X-Gm-Gg: ASbGnctzm7+YoOmR4EZP8DBiexhuEnexNE72p0ms0wuAi/YiD0qg7RKEjdk/cIKdV42 XMlxPzLwZ2cv+LzGIT8/3dXMN2zJGPs+j45Vj8rzQ7ZrFmQnPIC4MfkBoFgRr6nFsoj/tauV5xF 13Wax21BHiMAKGt2D6UBwphoKEYnREJ6AkzSD4dK/MTE/QLstOJKJj6S+1FV9pnCneoAXyIEoFs n4GtZJ3wsckMnwyFOGsCwcevhRiINL8Fq5XZIHC9+1+uqsv226wcmlb6mo8Rkt+L2akb9hr1BKF olVKewTUHDjdlU6xoDhmedbfO4GWXI0d9ccGRczdBzuUZckY7Dj3SIxJjhD/ X-Google-Smtp-Source: AGHT+IGTZRh1dng1cS6nXtvmlYaHaT4JigmSTfqI7srWDKy6ezd3F6rDneB917gZQNpcViR1HQ7A0g== X-Received: by 2002:a17:90a:f94d:b0:2fe:8fc4:6f4b with SMTP id 98e67ed59e1d1-2ff49727439mr7676859a91.8.1741207467339; Wed, 05 Mar 2025 12:44:27 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:d959:d427:c88a:cc02]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ff4e7bdac8sm1771083a91.42.2025.03.05.12.44.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 12:44:26 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Mar 2025 17:44:12 -0300 Message-ID: <20250305204413.36950-2-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250305204413.36950-1-jamrial@gmail.com> References: <20250305204413.36950-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] swscale/input: add support for YAF16 and YAF32 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- libswscale/input.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++ libswscale/utils.c | 4 +++ 2 files changed, 93 insertions(+) diff --git a/libswscale/input.c b/libswscale/input.c index d6b319f25f..dfa8ed15ab 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -1283,6 +1283,28 @@ static av_always_inline void grayf32ToY16_c(uint8_t *_dst, const uint8_t *_src, } } +static av_always_inline void read_yaf32_gray_c(uint8_t *_dst, const uint8_t *_src, const uint8_t *unused1, + const uint8_t *unused2, int width, int is_be, uint32_t *unused) +{ + int i; + const float *src = (const float *)_src; + uint16_t *dst = (uint16_t *)_dst; + + for (i = 0; i < width; ++i) + dst[i] = lrintf(av_clipf(65535.0f * rdpx(src + i*2), 0.0f, 65535.0f)); +} + +static av_always_inline void read_yaf32_alpha_c(uint8_t *_dst, const uint8_t *_src, const uint8_t *unused1, + const uint8_t *unused2, int width, int is_be, uint32_t *unused) +{ + int i; + const float *src = (const float *)_src; + uint16_t *dst = (uint16_t *)_dst; + + for (i = 0; i < width; ++i) + dst[i] = lrintf(av_clipf(65535.0f * rdpx(src + i*2 + 1), 0.0f, 65535.0f)); +} + #undef rdpx #define rgb9plus_planar_funcs_endian(nbits, endian_name, endian) \ @@ -1363,6 +1385,18 @@ static void grayf32##endian_name##ToY16_c(uint8_t *dst, const uint8_t *src, int width, uint32_t *unused, void *opq) \ { \ grayf32ToY16_c(dst, src, unused1, unused2, width, endian, unused); \ +} \ +static void read_yaf32##endian_name##_gray_c(uint8_t *dst, const uint8_t *src, \ + const uint8_t *unused1, const uint8_t *unused2, \ + int width, uint32_t *unused, void *opq) \ +{ \ + read_yaf32_gray_c(dst, src, unused1, unused2, width, endian, unused); \ +} \ +static void read_yaf32##endian_name##_alpha_c(uint8_t *dst, const uint8_t *src, \ + const uint8_t *unused1, const uint8_t *unused2, \ + int width, uint32_t *unused, void *opq) \ +{ \ + read_yaf32_alpha_c(dst, src, unused1, unused2, width, endian, unused); \ } rgbf32_funcs_endian(le, 0) @@ -1421,6 +1455,24 @@ static av_always_inline void grayf16ToY16_c(uint8_t *dst, const uint8_t *src, co } } +static av_always_inline void read_yaf16_gray_c(uint8_t *dst, const uint8_t *src, const uint8_t *unused1, + const uint8_t *unused2, int width, int is_be, uint32_t *unused, Half2FloatTables *h2f_tbl) +{ + int i; + + for (i = 0; i < width; i++) + AV_WN16(dst + 2*i, lrintf(av_clipf(65535.0f * rdpx2(src + 4*i), 0.0f, 65535.0f))); +} + +static av_always_inline void read_yaf16_alpha_c(uint8_t *dst, const uint8_t *src, const uint8_t *unused1, + const uint8_t *unused2, int width, int is_be, uint32_t *unused, Half2FloatTables *h2f_tbl) +{ + int i; + + for (i = 0; i < width; i++) + AV_WN16(dst + 2*i, lrintf(av_clipf(65535.0f * rdpx2(src + 4*i + 2), 0.0f, 65535.0f))); +} + static av_always_inline void rgbaf16ToUV_half_endian(uint16_t *dstU, uint16_t *dstV, int is_be, const uint16_t *src, int width, int32_t *rgb2yuv, Half2FloatTables *h2f_tbl) @@ -1557,6 +1609,19 @@ static void grayf16##endian_name##ToY16_c(uint8_t *dst, const uint8_t *src, { \ grayf16ToY16_c(dst, src, unused1, unused2, width, endian, unused, opq); \ } \ +static void read_yaf16##endian_name##_gray_c(uint8_t *dst, const uint8_t *src, \ + const uint8_t *unused1, const uint8_t *unused2, \ + int width, uint32_t *unused, void *opq) \ +{ \ + read_yaf16_gray_c(dst, src, unused1, unused2, width, endian, unused, opq); \ +} \ +static void read_yaf16##endian_name##_alpha_c(uint8_t *dst, const uint8_t *src, \ + const uint8_t *unused1, const uint8_t *unused2, \ + int width, uint32_t *unused, void *opq) \ +{ \ + read_yaf16_alpha_c(dst, src, unused1, unused2, width, endian, unused, opq); \ +} \ + \ static void rgbaf16##endian_name##ToUV_half_c(uint8_t *_dstU, uint8_t *_dstV, const uint8_t *unused, \ const uint8_t *src1, const uint8_t *src2, \ int width, uint32_t *_rgb2yuv, void *opq) \ @@ -2244,6 +2309,12 @@ av_cold void ff_sws_init_input_funcs(SwsInternal *c, case AV_PIX_FMT_YA16BE: *lumToYV12 = read_ya16be_gray_c; break; + case AV_PIX_FMT_YAF16LE: + *lumToYV12 = read_yaf16le_gray_c; + break; + case AV_PIX_FMT_YAF16BE: + *lumToYV12 = read_yaf16be_gray_c; + break; case AV_PIX_FMT_VUYA: case AV_PIX_FMT_VUYX: *lumToYV12 = read_vuyx_Y_c; @@ -2400,6 +2471,12 @@ av_cold void ff_sws_init_input_funcs(SwsInternal *c, case AV_PIX_FMT_GRAYF32BE: *lumToYV12 = grayf32beToY16_c; break; + case AV_PIX_FMT_YAF32LE: + *lumToYV12 = read_yaf32le_gray_c; + break; + case AV_PIX_FMT_YAF32BE: + *lumToYV12 = read_yaf32be_gray_c; + break; case AV_PIX_FMT_GRAYF16LE: *lumToYV12 = grayf16leToY16_c; break; @@ -2473,6 +2550,18 @@ av_cold void ff_sws_init_input_funcs(SwsInternal *c, case AV_PIX_FMT_YA16BE: *alpToYV12 = read_ya16be_alpha_c; break; + case AV_PIX_FMT_YAF16LE: + *alpToYV12 = read_yaf16le_alpha_c; + break; + case AV_PIX_FMT_YAF16BE: + *alpToYV12 = read_yaf16be_alpha_c; + break; + case AV_PIX_FMT_YAF32LE: + *alpToYV12 = read_yaf32le_alpha_c; + break; + case AV_PIX_FMT_YAF32BE: + *alpToYV12 = read_yaf32be_alpha_c; + break; case AV_PIX_FMT_VUYA: case AV_PIX_FMT_UYVA: *alpToYV12 = read_vuya_A_c; diff --git a/libswscale/utils.c b/libswscale/utils.c index c2fbaf5515..953bf015e4 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -252,6 +252,10 @@ static const FormatEntry format_entries[] = { [AV_PIX_FMT_GRAYF32BE] = { 1, 1 }, [AV_PIX_FMT_GRAYF16LE] = { 1, 0 }, [AV_PIX_FMT_GRAYF16BE] = { 1, 0 }, + [AV_PIX_FMT_YAF32LE] = { 1, 0 }, + [AV_PIX_FMT_YAF32BE] = { 1, 0 }, + [AV_PIX_FMT_YAF16LE] = { 1, 0 }, + [AV_PIX_FMT_YAF16BE] = { 1, 0 }, [AV_PIX_FMT_YUVA422P12BE] = { 1, 1 }, [AV_PIX_FMT_YUVA422P12LE] = { 1, 1 }, [AV_PIX_FMT_YUVA444P12BE] = { 1, 1 }, -- 2.48.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".