[FFmpeg-devel] [PATCH] avcodec/d3d12va_encode: fix l0 reference count limit

[FFmpeg-devel] [PATCH] avcodec/d3d12va_encode: fix l0 reference count limit

[Araz Iusubov]

Prevents potential null pointer dereference when querying 
MaxL1ReferencesForB from codec-specific support structures 
during GOP structure initialization.

---
 libavcodec/d3d12va_encode.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/d3d12va_encode.c b/libavcodec/d3d12va_encode.c
index 4d738200fe..e39d4d1c29 100644
--- a/libavcodec/d3d12va_encode.c
+++ b/libavcodec/d3d12va_encode.c
@@ -1088,13 +1088,15 @@ static int d3d12va_encode_init_gop_structure(AVCodecContext *avctx)
         switch (ctx->codec->d3d12_codec) {
             case D3D12_VIDEO_ENCODER_CODEC_H264:
                 ref_l0 = FFMIN(support.PictureSupport.pH264Support->MaxL0ReferencesForP,
-                               support.PictureSupport.pH264Support->MaxL1ReferencesForB);
+                               support.PictureSupport.pH264Support->MaxL1ReferencesForB ?
+                               support.PictureSupport.pHEVCSupport->MaxL1ReferencesForB : UINT_MAX);
                 ref_l1 = support.PictureSupport.pH264Support->MaxL1ReferencesForB;
                 break;
 
             case D3D12_VIDEO_ENCODER_CODEC_HEVC:
                 ref_l0 = FFMIN(support.PictureSupport.pHEVCSupport->MaxL0ReferencesForP,
-                               support.PictureSupport.pHEVCSupport->MaxL1ReferencesForB);
+                               support.PictureSupport.pHEVCSupport->MaxL1ReferencesForB ?
+                               support.PictureSupport.pHEVCSupport->MaxL1ReferencesForB : UINT_MAX);
                 ref_l1 = support.PictureSupport.pHEVCSupport->MaxL1ReferencesForB;
                 break;
 
-- 
2.45.2.windows.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] avcodec/d3d12va_encode: fix l0 reference count limit

[Tong Wu]

Araz Iusubov:
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Araz
> Iusubov
> Sent: Wednesday, June 4, 2025 4:37 PM
> To: ffmpeg-devel@ffmpeg.org
> Cc: Araz Iusubov <Primeadvice@gmail.com>
> Subject: [FFmpeg-devel] [PATCH] avcodec/d3d12va_encode: fix l0 reference
> count limit
> 
> Prevents potential null pointer dereference when querying MaxL1ReferencesForB
> from codec-specific support structures during GOP structure initialization.
> 
> ---
>  libavcodec/d3d12va_encode.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/d3d12va_encode.c b/libavcodec/d3d12va_encode.c index
> 4d738200fe..e39d4d1c29 100644
> --- a/libavcodec/d3d12va_encode.c
> +++ b/libavcodec/d3d12va_encode.c
> @@ -1088,13 +1088,15 @@ static int
> d3d12va_encode_init_gop_structure(AVCodecContext *avctx)
>          switch (ctx->codec->d3d12_codec) {
>              case D3D12_VIDEO_ENCODER_CODEC_H264:
>                  ref_l0 = FFMIN(support.PictureSupport.pH264Support-
> >MaxL0ReferencesForP,
> -                               support.PictureSupport.pH264Support-
> >MaxL1ReferencesForB);
> +                               support.PictureSupport.pH264Support-
> >MaxL1ReferencesForB ?
> +
> + support.PictureSupport.pHEVCSupport->MaxL1ReferencesForB : UINT_MAX);

Should be pH264 (minor fix I'll do it when pushing)

>                  ref_l1 = support.PictureSupport.pH264Support->MaxL1ReferencesForB;
>                  break;
> 
>              case D3D12_VIDEO_ENCODER_CODEC_HEVC:
>                  ref_l0 = FFMIN(support.PictureSupport.pHEVCSupport-
> >MaxL0ReferencesForP,
> -                               support.PictureSupport.pHEVCSupport-
> >MaxL1ReferencesForB);
> +                               support.PictureSupport.pHEVCSupport-
> >MaxL1ReferencesForB ?
> +
> + support.PictureSupport.pHEVCSupport->MaxL1ReferencesForB : UINT_MAX);
>                  ref_l1 = support.PictureSupport.pHEVCSupport->MaxL1ReferencesForB;
>                  break;
> 

LGTM, will apply.

Thanks,
Tong

_______________________________________________
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".