[FFmpeg-devel] [PATCH] avcodec/adpcmenc: Round up required buffer size

[FFmpeg-devel] [PATCH] avcodec/adpcmenc: Round up required buffer size

[Andreas Rheinhardt]

Otherwise the buffer might be too small. Fixes assert violations
when encoding mono audio with exactly one sample.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/adpcmenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c
index 1ffc5b410f..57709b19a1 100644
--- a/libavcodec/adpcmenc.c
+++ b/libavcodec/adpcmenc.c
@@ -614,7 +614,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
         avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_ALP ||
         avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_APM ||
         avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_WS)
-        pkt_size = (frame->nb_samples * channels) / 2;
+        pkt_size = (frame->nb_samples * channels + 1) / 2;
     else
         pkt_size = avctx->block_align;
     if ((ret = ff_get_encode_buffer(avctx, avpkt, pkt_size, 0)) < 0)
-- 
2.34.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/adpcmenc: Round up required buffer size

[Paul B Mahol]

On 9/15/22, Andreas Rheinhardt <andreas.rheinhardt@outlook.com> wrote:
> Otherwise the buffer might be too small. Fixes assert violations
> when encoding mono audio with exactly one sample.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/adpcmenc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c
> index 1ffc5b410f..57709b19a1 100644
> --- a/libavcodec/adpcmenc.c
> +++ b/libavcodec/adpcmenc.c
> @@ -614,7 +614,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx,
> AVPacket *avpkt,
>          avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_ALP ||
>          avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_APM ||
>          avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_WS)
> -        pkt_size = (frame->nb_samples * channels) / 2;
> +        pkt_size = (frame->nb_samples * channels + 1) / 2;
>      else
>          pkt_size = avctx->block_align;
>      if ((ret = ff_get_encode_buffer(avctx, avpkt, pkt_size, 0)) < 0)
> --
> 2.34.1

Nice catch, LGTM.

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