From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6468B43FD0 for ; Tue, 23 Aug 2022 23:34:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 079FF68B9DE; Wed, 24 Aug 2022 02:34:44 +0300 (EEST) Received: from mail-vk1-f182.google.com (mail-vk1-f182.google.com [209.85.221.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C77168B7E6 for ; Wed, 24 Aug 2022 02:34:37 +0300 (EEST) Received: by mail-vk1-f182.google.com with SMTP id q14so7849767vke.9 for ; Tue, 23 Aug 2022 16:34:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=So0w6baGK5+3fN+O3VxYkwc0SZR8e7KWreIO076qhiY=; b=fwvy3x1+q9r6NxuHd38Np6ZLo1sWHPOtbDdLpv3c1bDVOpT/5BxDon3bzOy8QeX6vM zSKoU5Cr1JF1xK+8gZgmmiARyB1bqozH9CLtldK0UNgTbK9pJ5k+2pWEYnFF1K4h9Dm3 nRt8vvYoqVuoze+LFfvrsbQ0Re9o4BPPoOIijy3Lc3v5lQeMacSEDj+7Y0twOJnQ/jXY iUY7ZES1Mb9x9gN/+zCg9l0skFJFVX91q/U+IK8RHFlekmJ/7I/gQLwD48ZDoNkiHTlY uNeyD15KGJf7NP9Cwz24UfSrz9PWml72ladnADqTs6l8j2shp/HynAmEAlHL5ecrjn7G dv+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=So0w6baGK5+3fN+O3VxYkwc0SZR8e7KWreIO076qhiY=; b=AROH4GrEGC/GyMZENqdgIpnxtPraRPORFE4ojHObZgZvG50NWh1WvIY91+9OXW7Vns EHQDhuXOSD4O7m9I4NQH1skzx2IkX5OccNaLQ02y1eWfMjA8v7QGTBcRnCbSA8OxpiVF KZ6Wm8WX4FUhU6lVEmBC4IjsHDQXgbum7GOPf0pqZF7MjlHQeSJCpVUt7wgL2NyCh/vb 8U7uRO5gkvtuYXmoqzqISeBZPdodv5egAJqdGfMbBbH9nj4TW6upeHWJH50ZJtB4U5Wb YFXa8omRKoIgBDcgOXEbvMxmS0JGHkIJvstYYgtjLK54E7GBlQaxschbDIO/XjtvtUMP Ifqw== X-Gm-Message-State: ACgBeo33aH1JOQfs1b8D4K9MdRdlZbU/QKBgAJ3eS9vYLgbT8JaqTdZf KKIbkBb+O2FqV5huGUPaNkBmI1k2IRE= X-Google-Smtp-Source: AA6agR5mzTK9sTyALBxYW8MsKUixRzn2KzhofFcnUZHLOKeyMxE2GZ+/9L0Vji11m3dbeUvoFO7ZUg== X-Received: by 2002:a1f:2ecd:0:b0:376:1d2f:9119 with SMTP id u196-20020a1f2ecd000000b003761d2f9119mr10671089vku.40.1661297675503; Tue, 23 Aug 2022 16:34:35 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id f41-20020a056102152900b003908d2ec4c5sm977140vsv.34.2022.08.23.16.34.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 16:34:35 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Aug 2022 20:34:18 -0300 Message-Id: <20220823233418.2367-2-jamrial@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823233418.2367-1-jamrial@gmail.com> References: <20220823233418.2367-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/libaomenc: use av_fast_realloc() to resize the stats buffer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- libavcodec/libaomenc.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 1fd69d59a7..485f554165 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -70,6 +70,7 @@ typedef struct AOMEncoderContext { struct aom_codec_ctx encoder; struct aom_image rawimg; struct aom_fixed_buf twopass_stats; + unsigned twopass_stats_size; struct FrameListData *coded_frame_list; int cpu_used; int auto_alt_ref; @@ -1200,14 +1201,17 @@ static int queue_frames(AVCodecContext *avctx, AVPacket *pkt_out) case AOM_CODEC_STATS_PKT: { struct aom_fixed_buf *stats = &ctx->twopass_stats; - int err; - if ((err = av_reallocp(&stats->buf, - stats->sz + - pkt->data.twopass_stats.sz)) < 0) { + uint8_t *tmp = av_fast_realloc(stats->buf, + &ctx->twopass_stats_size, + stats->sz + + pkt->data.twopass_stats.sz); + if (!tmp) { + av_freep(&stats->buf); stats->sz = 0; 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, pkt->data.twopass_stats.buf, pkt->data.twopass_stats.sz); stats->sz += pkt->data.twopass_stats.sz; -- 2.37.2 _______________________________________________ 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".