[FFmpeg-devel] [PATCH 1/2] swscale: fix gray -> grayf32 SIGFPE

[FFmpeg-devel] [PATCH 1/2] swscale: fix gray -> grayf32 SIGFPE

[Niklas Haas]

From: Niklas Haas <git@haasn.dev>

swscale internals don't distinguish between 16-bit and higher bit depth
output formats internally when it comes to the choice of intermediate
representation.

Clamping this value both prevents a SIGFPE and also aligns the check
with reality.
---
 libswscale/swscale.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 98f94d029f..65ed654ebd 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -586,7 +586,7 @@ static void solve_range_convert(uint16_t src_min, uint16_t src_max,
 
 static void init_range_convert_constants(SwsInternal *c)
 {
-    const int bit_depth = c->dstBpc ? c->dstBpc : 8;
+    const int bit_depth = c->dstBpc ? FFMIN(c->dstBpc, 16) : 8;
     const int src_bits = bit_depth <= 14 ? 15 : 19;
     const int src_shift = src_bits - bit_depth;
     const int mult_shift = bit_depth <= 14 ? 14 : 18;
-- 
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".

[FFmpeg-devel] [PATCH 2/2] swscale/swscale_unscaled: avoid nv12 <-> nv21 bug

[Niklas Haas]

From: Niklas Haas <git@haasn.dev>

This is not handled by the planar copy wrapper, so exclude it.
---
 libswscale/swscale_unscaled.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 1df160daaa..4959963b18 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -2660,7 +2660,8 @@ void ff_get_unscaled_swscale(SwsInternal *c)
         (isPlanarYUV(srcFormat) && isPlanarYUV(dstFormat) &&
          c->chrDstHSubSample == c->chrSrcHSubSample &&
          c->chrDstVSubSample == c->chrSrcVSubSample &&
-         isSemiPlanarYUV(srcFormat) == isSemiPlanarYUV(dstFormat))))
+         isSemiPlanarYUV(srcFormat) == isSemiPlanarYUV(dstFormat) &&
+         isSwappedChroma(srcFormat) == isSwappedChroma(dstFormat))))
     {
         if (isPacked(c->opts.src_format))
             c->convert_unscaled = packedCopyWrapper;
-- 
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".

Re: [FFmpeg-devel] [PATCH 2/2] swscale/swscale_unscaled: avoid nv12 <-> nv21 bug

[James Almer]

[-- Attachment #1.1.1: Type: text/plain, Size: 1052 bytes --]

On 3/16/2025 9:52 AM, Niklas Haas wrote:
> From: Niklas Haas <git@haasn.dev>
> 
> This is not handled by the planar copy wrapper, so exclude it.
> ---
>   libswscale/swscale_unscaled.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
> index 1df160daaa..4959963b18 100644
> --- a/libswscale/swscale_unscaled.c
> +++ b/libswscale/swscale_unscaled.c
> @@ -2660,7 +2660,8 @@ void ff_get_unscaled_swscale(SwsInternal *c)
>           (isPlanarYUV(srcFormat) && isPlanarYUV(dstFormat) &&
>            c->chrDstHSubSample == c->chrSrcHSubSample &&
>            c->chrDstVSubSample == c->chrSrcVSubSample &&
> -         isSemiPlanarYUV(srcFormat) == isSemiPlanarYUV(dstFormat))))
> +         isSemiPlanarYUV(srcFormat) == isSemiPlanarYUV(dstFormat) &&
> +         isSwappedChroma(srcFormat) == isSwappedChroma(dstFormat))))
>       {
>           if (isPacked(c->opts.src_format))
>               c->convert_unscaled = packedCopyWrapper;

LGTM.


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 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".