[FFmpeg-devel] [PATCH] lavc/vaapi_decode: Reject decoding of frames with no slices

[FFmpeg-devel] [PATCH] lavc/vaapi_decode: Reject decoding of frames with no slices

[David Rosca]

Matches other hwaccels.
---
 libavcodec/vaapi_decode.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c
index 8e9f647c20..3c4030c073 100644
--- a/libavcodec/vaapi_decode.c
+++ b/libavcodec/vaapi_decode.c
@@ -157,6 +157,11 @@ int ff_vaapi_decode_issue(AVCodecContext *avctx,
     VAStatus vas;
     int err;
 
+    if (pic->nb_slices <= 0) {
+        err = -1;
+        goto fail;
+    }
+
     av_log(avctx, AV_LOG_DEBUG, "Decode to surface %#x.\n",
            pic->output_surface);
 
-- 
2.45.0

_______________________________________________
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] lavc/vaapi_decode: Reject decoding of frames with no slices

[Xiang, Haihao]

On Vr, 2024-05-10 at 11:55 +0200, David Rosca wrote:
> Matches other hwaccels.
> ---
>  libavcodec/vaapi_decode.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c
> index 8e9f647c20..3c4030c073 100644
> --- a/libavcodec/vaapi_decode.c
> +++ b/libavcodec/vaapi_decode.c
> @@ -157,6 +157,11 @@ int ff_vaapi_decode_issue(AVCodecContext *avctx,
>      VAStatus vas;
>      int err;
>  
> +    if (pic->nb_slices <= 0) {
> +        err = -1;

Better to return a valid averror code, e.g. AVERROR(EINVAL).

Thanks
Haihao

> +        goto fail;
> +    }
> +
>      av_log(avctx, AV_LOG_DEBUG, "Decode to surface %#x.\n",
>             pic->output_surface);
>  

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