From patchwork Thu Feb 4 19:09:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25430 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0E04D44A6BE for ; Thu, 4 Feb 2021 21:16:13 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E5BF768AA42; Thu, 4 Feb 2021 21:11:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3BF47689972 for ; Thu, 4 Feb 2021 21:11:44 +0200 (EET) Received: by mail-qk1-f173.google.com with SMTP id x81so4492471qkb.0 for ; Thu, 04 Feb 2021 11:11:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=mh9R8tpmzAAOgr6sZo8DrM5AV75NrTVKrj7eCPgZNyk=; b=ObWdBHyzj8/xARiCRYBIzRFTHNjIfxDMXprhrTylK8ZcZ4kGFGNAa3e0D4PIQiKSW5 AAX+QZjPPQfxpge1mo52f20OC9NxkfxOo+cEurFBGfqny4Dj5Y+rNvlZh7wHrle/bcQ8 W6K+JCaRzUrYSMfQU/nqygyDzMRM1AFJWSiBhx+zG5AI/LwY7woWuuAfyhAE93NLPK8w RA8iqp58cdinGUzHiMhRWtjGsanvlbVuY/Ws0BFNservm79YXdtNwJYA8OJWlpMuYBu7 CjlYVXLowZjq5IHpMqCV/JMMO/0gDEPkGGz2nkOs3N6fxTdR99ocW2a6HI/XA1OSom6a V2aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mh9R8tpmzAAOgr6sZo8DrM5AV75NrTVKrj7eCPgZNyk=; b=J2YvL4aXHcgH1UHQx295iZz8lS+9pA/Pvfj1ed2ozcl1feTEjR/JoZvBIRVBc3dvbg dPEDIC/5IDLoMIdc7jYtZjKC2718X6MZqmrQ57dBSQaFFOQxQeffXGvzDfRNCDq5QgOu wAzTkLN5aUZdO1c8GcNAB1HCCW1LoDSjYK+/4v+DNtqCbaGRBmvJuqGfJKDjpl8t7B/0 Uo3aP0i/xmErrUALJOQ1rSmEADiQEXxoPCED7Xf5srqTp6oTNC9ZvdYnl8XSrmmPi2Qg NVxJcFJmBMcloZkJRtxpWmjmmbJQu7K8qcpWI4EpvDSG4D+k485Bcqlup0YeyFqMD7eI aZ8w== X-Gm-Message-State: AOAM530BRdXZfOpfenZKa9wStcd8UxQ/mR+7k8WTbd+Xl2ds7bzdzOiv gadMkZcHb9grsiQLxFifghb7WguMDh4= X-Google-Smtp-Source: ABdhPJwS7nmZ04LVJzD7bJQOrmTkePjapifY99oXgXr6PMTcGv06rZxOq8N0dYVM+YiC3IylP1VCGg== X-Received: by 2002:a05:620a:1090:: with SMTP id g16mr623433qkk.147.1612465902846; Thu, 04 Feb 2021 11:11:42 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.11.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:11:42 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:52 -0300 Message-Id: <20210204191005.48190-38-jamrial@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204191005.48190-1-jamrial@gmail.com> References: <20210204191005.48190-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 37/50] avfilter/vf_uspp: use av_packet_alloc() to allocate packets X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavfilter/vf_uspp.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index 8b39f53c3d..8c75207593 100644 --- a/libavfilter/vf_uspp.c +++ b/libavfilter/vf_uspp.c @@ -51,6 +51,7 @@ typedef struct USPPContext { int outbuf_size; uint8_t *outbuf; AVCodecContext *avctx_enc[BLOCK*BLOCK]; + AVPacket *pkt; AVFrame *frame; AVFrame *frame_dec; int8_t *non_b_qp_table; @@ -240,19 +241,19 @@ static void filter(USPPContext *p, uint8_t *dst[3], uint8_t *src[3], const int y1c = y1 >> p->vsub; const int BLOCKc = BLOCK >> p->hsub; int offset; - AVPacket pkt = {0}; + AVPacket *pkt = p->pkt; int got_pkt_ptr; - av_init_packet(&pkt); - pkt.data = p->outbuf; - pkt.size = p->outbuf_size; + av_packet_unref(pkt); + pkt->data = p->outbuf; + pkt->size = p->outbuf_size; p->frame->data[0] = p->src[0] + x1 + y1 * p->frame->linesize[0]; p->frame->data[1] = p->src[1] + x1c + y1c * p->frame->linesize[1]; p->frame->data[2] = p->src[2] + x1c + y1c * p->frame->linesize[2]; p->frame->format = p->avctx_enc[i]->pix_fmt; - ret = avcodec_encode_video2(p->avctx_enc[i], &pkt, p->frame, &got_pkt_ptr); + ret = avcodec_encode_video2(p->avctx_enc[i], pkt, p->frame, &got_pkt_ptr); if (ret < 0) { av_log(p->avctx_enc[i], AV_LOG_ERROR, "Encoding failed\n"); continue; @@ -373,6 +374,8 @@ static int config_input(AVFilterLink *inlink) uspp->outbuf_size = (width + BLOCK) * (height + BLOCK) * 10; if (!(uspp->frame = av_frame_alloc())) return AVERROR(ENOMEM); + if (!(uspp->pkt = av_packet_alloc())) + return AVERROR(ENOMEM); if (!(uspp->outbuf = av_malloc(uspp->outbuf_size))) return AVERROR(ENOMEM); @@ -465,6 +468,7 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&uspp->non_b_qp_table); av_freep(&uspp->outbuf); + av_packet_free(&uspp->pkt); av_frame_free(&uspp->frame); }