This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 1300ce4555e42cbbfa14d4b89ec0f4de03dfb6f8 Author: James Almer <[email protected]> AuthorDate: Mon Nov 9 10:08:27 2026 -0300 Commit: James Almer <[email protected]> CommitDate: Tue Nov 10 13:46:34 2026 +0000 swscale/input: add support for RGBAF32 Signed-off-by: James Almer <[email protected]> --- libswscale/format.c | 2 + libswscale/input.c | 106 ++++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 88 insertions(+), 20 deletions(-) diff --git a/libswscale/format.c b/libswscale/format.c index f14737f649..ffa9fda56e 100644 --- a/libswscale/format.c +++ b/libswscale/format.c @@ -271,6 +271,8 @@ static const LegacyFormatEntry legacy_format_entries[] = { [AV_PIX_FMT_RGBF16LE] = { 1, 0 }, [AV_PIX_FMT_RGBF32BE] = { 1, 0 }, [AV_PIX_FMT_RGBF32LE] = { 1, 0 }, + [AV_PIX_FMT_RGBAF32BE] = { 1, 0 }, + [AV_PIX_FMT_RGBAF32LE] = { 1, 0 }, [AV_PIX_FMT_XV30LE] = { 1, 1 }, [AV_PIX_FMT_XV36LE] = { 1, 1 }, [AV_PIX_FMT_XV36BE] = { 1, 1 }, diff --git a/libswscale/input.c b/libswscale/input.c index 2e6dd6f413..9823210768 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -1333,44 +1333,47 @@ static av_always_inline void planar_rgbf32_to_y(uint8_t *_dst, const uint8_t *_s } } -static av_always_inline void rgbf32_to_uv_c(uint8_t *_dstU, uint8_t *_dstV, const uint8_t *unused1, - const uint8_t *_src, const uint8_t *unused2, +static av_always_inline void rgbf32_to_uv_c(uint8_t *_dstU, uint8_t *_dstV, + const uint8_t *_src, int nb_components, int width, int is_be, int32_t *rgb2yuv) { int i; const float *src = (const float *)_src; uint16_t *dstU = (uint16_t *)_dstU; uint16_t *dstV = (uint16_t *)_dstV; + ptrdiff_t stride = nb_components; int32_t ru = rgb2yuv[RU_IDX], gu = rgb2yuv[GU_IDX], bu = rgb2yuv[BU_IDX]; int32_t rv = rgb2yuv[RV_IDX], gv = rgb2yuv[GV_IDX], bv = rgb2yuv[BV_IDX]; for (i = 0; i < width; i++) { - int r = lrintf(av_clipf(65535.0f * rdpx(&src[3*i]), 0.0f, 65535.0f)); - int g = lrintf(av_clipf(65535.0f * rdpx(&src[3*i + 1]), 0.0f, 65535.0f)); - int b = lrintf(av_clipf(65535.0f * rdpx(&src[3*i + 2]), 0.0f, 65535.0f)); + int r = lrintf(av_clipf(65535.0f * rdpx(&src[stride*i + 0]), 0.0f, 65535.0f)); + int g = lrintf(av_clipf(65535.0f * rdpx(&src[stride*i + 1]), 0.0f, 65535.0f)); + int b = lrintf(av_clipf(65535.0f * rdpx(&src[stride*i + 2]), 0.0f, 65535.0f)); dstU[i] = (ru*r + gu*g + bu*b + (0x10001 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT; dstV[i] = (rv*r + gv*g + bv*b + (0x10001 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT; } } -static av_always_inline void rgbf32_to_uv_half_c(uint8_t *_dstU, uint8_t *_dstV, const uint8_t *unused1, - const uint8_t *_src, const uint8_t *unused2, +static av_always_inline void rgbf32_to_uv_half_c(uint8_t *_dstU, uint8_t *_dstV, + const uint8_t *_src, int nb_components, int width, int is_be, int32_t *rgb2yuv) { const float *src = (const float *) _src; uint16_t *dstU = (uint16_t *) _dstU; uint16_t *dstV = (uint16_t *) _dstV; + ptrdiff_t stride = nb_components * 2; + ptrdiff_t step = nb_components; int32_t ru = rgb2yuv[RU_IDX], gu = rgb2yuv[GU_IDX], bu = rgb2yuv[BU_IDX]; int32_t rv = rgb2yuv[RV_IDX], gv = rgb2yuv[GV_IDX], bv = rgb2yuv[BV_IDX]; for (int i = 0; i < width; i++) { - int r = (lrintf(av_clipf(65535.0f * rdpx(&src[6 * i + 0]), 0.0f, 65535.0f)) + - lrintf(av_clipf(65535.0f * rdpx(&src[6 * i + 3]), 0.0f, 65535.0f))) >> 1; - int g = (lrintf(av_clipf(65535.0f * rdpx(&src[6 * i + 1]), 0.0f, 65535.0f)) + - lrintf(av_clipf(65535.0f * rdpx(&src[6 * i + 4]), 0.0f, 65535.0f))) >> 1; - int b = (lrintf(av_clipf(65535.0f * rdpx(&src[6 * i + 2]), 0.0f, 65535.0f)) + - lrintf(av_clipf(65535.0f * rdpx(&src[6 * i + 5]), 0.0f, 65535.0f))) >> 1; + int r = (lrintf(av_clipf(65535.0f * rdpx(&src[stride * i + 0 ]), 0.0f, 65535.0f)) + + lrintf(av_clipf(65535.0f * rdpx(&src[stride * i + step ]), 0.0f, 65535.0f))) >> 1; + int g = (lrintf(av_clipf(65535.0f * rdpx(&src[stride * i + 1 ]), 0.0f, 65535.0f)) + + lrintf(av_clipf(65535.0f * rdpx(&src[stride * i + step + 1]), 0.0f, 65535.0f))) >> 1; + int b = (lrintf(av_clipf(65535.0f * rdpx(&src[stride * i + 2 ]), 0.0f, 65535.0f)) + + lrintf(av_clipf(65535.0f * rdpx(&src[stride * i + step + 2]), 0.0f, 65535.0f))) >> 1; dstU[i] = (ru*r + gu*g + bu*b + (0x10001 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT; dstV[i] = (rv*r + gv*g + bv*b + (0x10001 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT; @@ -1378,24 +1381,35 @@ static av_always_inline void rgbf32_to_uv_half_c(uint8_t *_dstU, uint8_t *_dstV, } static av_always_inline void rgbf32_to_y_c(uint8_t *_dst, const uint8_t *_src, - const uint8_t *unused1, const uint8_t *unused2, + int nb_components, int width, int is_be, int32_t *rgb2yuv) { int i; const float *src = (const float *)_src; uint16_t *dst = (uint16_t *)_dst; + ptrdiff_t stride = nb_components; int32_t ry = rgb2yuv[RY_IDX], gy = rgb2yuv[GY_IDX], by = rgb2yuv[BY_IDX]; for (i = 0; i < width; i++) { - int r = lrintf(av_clipf(65535.0f * rdpx(&src[3*i]), 0.0f, 65535.0f)); - int g = lrintf(av_clipf(65535.0f * rdpx(&src[3*i + 1]), 0.0f, 65535.0f)); - int b = lrintf(av_clipf(65535.0f * rdpx(&src[3*i + 2]), 0.0f, 65535.0f)); + int r = lrintf(av_clipf(65535.0f * rdpx(&src[stride*i + 0]), 0.0f, 65535.0f)); + int g = lrintf(av_clipf(65535.0f * rdpx(&src[stride*i + 1]), 0.0f, 65535.0f)); + int b = lrintf(av_clipf(65535.0f * rdpx(&src[stride*i + 2]), 0.0f, 65535.0f)); dst[i] = (ry*r + gy*g + by*b + (0x2001 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT; } } +static av_always_inline void rgbaf32_to_a_c(uint8_t *_dst, const uint8_t *_src, int width, int is_be) +{ + const float *src = (const float *)_src; + uint16_t *dst = (uint16_t *)_dst; + + for (int i = 0; i < width; i++) { + dst[i] = lrintf(av_clipf(65535.0f * rdpx(&src[4*i + 3]), 0.0f, 65535.0f)); + } +} + static av_always_inline void grayf32ToY16_c(uint8_t *_dst, const uint8_t *_src, const uint8_t *unused1, const uint8_t *unused2, int width, int is_be, uint32_t *unused) { @@ -1515,7 +1529,7 @@ static void rgbf32##endian_name##_to_y_c(uint8_t *dst, const uint8_t *src, const uint8_t *unused1, const uint8_t *unused2, \ int w, uint32_t *rgb2yuv, void *opq) \ { \ - rgbf32_to_y_c(dst, src, unused1, unused2, w, endian, rgb2yuv); \ + rgbf32_to_y_c(dst, src, 3, w, endian, rgb2yuv); \ } \ static void rgbf32##endian_name##_to_uv_c(uint8_t *dstU, uint8_t *dstV, \ const uint8_t *unused1, \ @@ -1523,7 +1537,7 @@ static void rgbf32##endian_name##_to_uv_c(uint8_t *dstU, uint8_t *dstV, int w, uint32_t *rgb2yuv, \ void *opq) \ { \ - rgbf32_to_uv_c(dstU, dstV, unused1, src, unused2, w, endian, rgb2yuv); \ + rgbf32_to_uv_c(dstU, dstV, src, 3, w, endian, rgb2yuv); \ } \ static void rgbf32##endian_name##_to_uv_half_c(uint8_t *dstU, uint8_t *dstV, \ const uint8_t *unused1, \ @@ -1531,7 +1545,35 @@ static void rgbf32##endian_name##_to_uv_half_c(uint8_t *dstU, uint8_t *dstV, int w, uint32_t *rgb2yuv, \ void *opq) \ { \ - rgbf32_to_uv_half_c(dstU, dstV, unused1, src, unused2, w, endian, rgb2yuv); \ + rgbf32_to_uv_half_c(dstU, dstV, src, 3, w, endian, rgb2yuv); \ +} \ +static void rgbaf32##endian_name##_to_y_c(uint8_t *dst, const uint8_t *src, \ + const uint8_t *unused1, const uint8_t *unused2, \ + int w, uint32_t *rgb2yuv, void *opq) \ +{ \ + rgbf32_to_y_c(dst, src, 4, w, endian, rgb2yuv); \ +} \ +static void rgbaf32##endian_name##_to_uv_c(uint8_t *dstU, uint8_t *dstV, \ + const uint8_t *unused1, \ + const uint8_t *src, const uint8_t *unused2, \ + int w, uint32_t *rgb2yuv, \ + void *opq) \ +{ \ + rgbf32_to_uv_c(dstU, dstV, src, 4, w, endian, rgb2yuv); \ +} \ +static void rgbaf32##endian_name##_to_uv_half_c(uint8_t *dstU, uint8_t *dstV, \ + const uint8_t *unused1, \ + const uint8_t *src, const uint8_t *unused2, \ + int w, uint32_t *rgb2yuv, \ + void *opq) \ +{ \ + rgbf32_to_uv_half_c(dstU, dstV, src, 4, w, endian, rgb2yuv); \ +} \ +static void rgbaf32##endian_name##_to_a_c(uint8_t *_dst, const uint8_t *_src, \ + const uint8_t *unused1, const uint8_t *unused2, \ + int w, uint32_t *unused, void *opq) \ +{ \ + rgbaf32_to_a_c(_dst, _src, w, endian); \ } \ static void grayf32##endian_name##ToY16_c(uint8_t *dst, const uint8_t *src, \ const uint8_t *unused1, const uint8_t *unused2, \ @@ -2121,6 +2163,12 @@ av_cold void ff_sws_init_input_funcs(SwsInternal *c, case AV_PIX_FMT_RGBF32BE: *chrToYV12 = rgbf32be_to_uv_c; break; + case AV_PIX_FMT_RGBAF32LE: + *chrToYV12 = rgbaf32le_to_uv_c; + break; + case AV_PIX_FMT_RGBAF32BE: + *chrToYV12 = rgbaf32be_to_uv_c; + break; } if (c->chrSrcHSubSample) { switch (srcFormat) { @@ -2230,6 +2278,12 @@ av_cold void ff_sws_init_input_funcs(SwsInternal *c, case AV_PIX_FMT_RGBF32LE: *chrToYV12 = rgbf32le_to_uv_half_c; break; + case AV_PIX_FMT_RGBAF32BE: + *chrToYV12 = rgbaf32be_to_uv_half_c; + break; + case AV_PIX_FMT_RGBAF32LE: + *chrToYV12 = rgbaf32le_to_uv_half_c; + break; } } else { switch (srcFormat) { @@ -2754,6 +2808,12 @@ av_cold void ff_sws_init_input_funcs(SwsInternal *c, case AV_PIX_FMT_RGBF32BE: *lumToYV12 = rgbf32be_to_y_c; break; + case AV_PIX_FMT_RGBAF32LE: + *lumToYV12 = rgbaf32le_to_y_c; + break; + case AV_PIX_FMT_RGBAF32BE: + *lumToYV12 = rgbaf32be_to_y_c; + break; } if (c->needAlpha) { if (is16BPS(srcFormat) || isNBPS(srcFormat)) { @@ -2779,6 +2839,12 @@ av_cold void ff_sws_init_input_funcs(SwsInternal *c, case AV_PIX_FMT_RGBAF16LE: *alpToYV12 = rgbaf16leToA_c; break; + case AV_PIX_FMT_RGBAF32BE: + *alpToYV12 = rgbaf32be_to_a_c; + break; + case AV_PIX_FMT_RGBAF32LE: + *alpToYV12 = rgbaf32le_to_a_c; + break; case AV_PIX_FMT_YA8: *alpToYV12 = uyvyToY_c; break; -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
