Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Paul B Mahol <onemda@gmail.com>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: Re: [FFmpeg-devel] [PATCH] avcodec/adpcmenc: Round up required buffer size
Date: Thu, 15 Sep 2022 18:01:01 +0200
Message-ID: <CAPYw7P5quM-MkPnCseLM9NYRQ9XvgpCc+99tCQZ9KK2AdpzX1w@mail.gmail.com> (raw)
In-Reply-To: <GV1P250MB073732E5EBBBB202D53994B38F499@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM>

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

      reply	other threads:[~2022-09-15 16:01 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-15 15:58 Andreas Rheinhardt
2022-09-15 16:01 ` Paul B Mahol [this message]

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=CAPYw7P5quM-MkPnCseLM9NYRQ9XvgpCc+99tCQZ9KK2AdpzX1w@mail.gmail.com \
    --to=onemda@gmail.com \
    --cc=andreas.rheinhardt@outlook.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