| Message ID | GV1P250MB073732E5EBBBB202D53994B38F499@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | bffc8f9af1f8e760a63cbc3680ad814b3c1b99ec |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/adpcmenc: Round up required buffer size | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
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". >
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)
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(-)