From: Josh Allmann <joshua.allmann@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH] avcodec/nvenc: Fix segfault with intra-only
Date: Mon, 1 Jul 2024 09:52:14 -0700
Message-ID: <CAPEbzdvuQkpA-hSiR0FQZk-X9ihg-A8X=p3CCAEkS2iL=iMvUQ@mail.gmail.com> (raw)
In-Reply-To: <20240621003355.3301-1-joshua.allmann@gmail.com>
On Thu, 20 Jun 2024 at 17:39, Josh Allmann <joshua.allmann@gmail.com> wrote:
>
> In intra-only mode, frameIntervalP is 0, which means the frame
> data array is smaller than the number of surfaces. This causes a
> crash when closing the encoder.
>
> Fix this by making sure the frame data array is at least as big as
> the number of surfaces.
> ---
> libavcodec/nvenc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
> index a9945355ba..93e87b21db 100644
> --- a/libavcodec/nvenc.c
> +++ b/libavcodec/nvenc.c
> @@ -1021,7 +1021,7 @@ static av_cold int nvenc_recalc_surfaces(AVCodecContext *avctx)
>
> // Output in the worst case will only start when the surface buffer is completely full.
> // Hence we need to keep at least the max amount of surfaces plus the max reorder delay around.
> - ctx->frame_data_array_nb = ctx->nb_surfaces + ctx->encode_config.frameIntervalP - 1;
> + ctx->frame_data_array_nb = FFMAX(ctx->nb_surfaces, ctx->nb_surfaces + ctx->encode_config.frameIntervalP - 1);
>
> return 0;
> }
> --
> 2.39.2
>
Hello,
Ping for review. This patch fixes an easily triggered crash with nvenc
in intra-only mode, eg
ffmpeg -i <in> -c:v h264_nvenc -g 0 <out>
Josh
_______________________________________________
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".
next prev parent reply other threads:[~2024-07-01 16:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-21 0:33 Josh Allmann
2024-07-01 16:52 ` Josh Allmann [this message]
2024-07-01 18:01 ` Timo Rothenpieler
2024-07-01 18:05 ` Dennis Mungai
2024-07-01 21:27 ` Timo Rothenpieler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAPEbzdvuQkpA-hSiR0FQZk-X9ihg-A8X=p3CCAEkS2iL=iMvUQ@mail.gmail.com' \
--to=joshua.allmann@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git