RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/libaomenc: use av_fast_realloc() to resize the stats buffer 

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2022-08-23 20:32:33 -03:00
parent 57041bb7b5
commit 22514527d3
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/libaomenc.c
View File

@ -70,6 +70,7 @@ typedef struct AOMEncoderContext {
struct aom_codec_ctx encoder; struct aom_codec_ctx encoder;
struct aom_image rawimg; struct aom_image rawimg;
struct aom_fixed_buf twopass_stats; struct aom_fixed_buf twopass_stats;
unsigned twopass_stats_size;
struct FrameListData *coded_frame_list; struct FrameListData *coded_frame_list;
int cpu_used; int cpu_used;
int auto_alt_ref; int auto_alt_ref;
@ -1200,14 +1201,17 @@ static int queue_frames(AVCodecContext *avctx, AVPacket *pkt_out)
case AOM_CODEC_STATS_PKT: case AOM_CODEC_STATS_PKT:
{ {
struct aom_fixed_buf *stats = &ctx->twopass_stats; struct aom_fixed_buf *stats = &ctx->twopass_stats;
int err; uint8_t *tmp = av_fast_realloc(stats->buf,
if ((err = av_reallocp(&stats->buf, &ctx->twopass_stats_size,
stats->sz + stats->sz +
pkt->data.twopass_stats.sz)) < 0) { pkt->data.twopass_stats.sz);
if (!tmp) {
av_freep(&stats->buf);
stats->sz = 0; stats->sz = 0;
av_log(avctx, AV_LOG_ERROR, "Stat buffer realloc failed\n"); av_log(avctx, AV_LOG_ERROR, "Stat buffer realloc failed\n");
return err; return AVERROR(ENOMEM);
} }
stats->buf = tmp;
memcpy((uint8_t *)stats->buf + stats->sz, memcpy((uint8_t *)stats->buf + stats->sz,
pkt->data.twopass_stats.buf, pkt->data.twopass_stats.sz); pkt->data.twopass_stats.buf, pkt->data.twopass_stats.sz);
stats->sz += pkt->data.twopass_stats.sz; stats->sz += pkt->data.twopass_stats.sz;