From patchwork Fri Mar 5 16:33:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26154 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 1CDE644B0AC for ; Fri, 5 Mar 2021 18:42:35 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D684168AD22; Fri, 5 Mar 2021 18:36:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f170.google.com (mail-qt1-f170.google.com [209.85.160.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 748E768ACE1 for ; Fri, 5 Mar 2021 18:36:11 +0200 (EET) Received: by mail-qt1-f170.google.com with SMTP id 18so2183547qty.3 for ; Fri, 05 Mar 2021 08:36:11 -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=texb2Ez2JbtwWMJpzIkYDr0TK2twJK1GsbXKWbfg4Zo=; b=gtTT18gBjiEXnM4z744jHoEUuefogXIlS47UKd6y2FRi7HlURNiRb0bCSwLW2Uy/ur sJUTqK1w/8DQNIlT/r4NevMWcubcxfnFPvBTCdmfzkVmYdzD3IlQYRHIe6Ntt1Dggs5p Z5gQ8S/TrCb00p92huInhNdtEE020CF+xSMKCwI7gVCVWRFDoLBj4QdA7PRzGnphwzeP w8x/jhXhYceju+nvC0JfHxrxeRF7J+uc87TqV3yDQY3lqHElYkgSB90/2MsF38tuqHZf FOjqJUwKfppRoxWOPwVmm+RQobfp1AFHzQ5h55Dvtmx4ruDDyxJ0+H9Zd3AFgn5ZnEOm TF/Q== 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=texb2Ez2JbtwWMJpzIkYDr0TK2twJK1GsbXKWbfg4Zo=; b=S6rQ+YC+soA7CWEagnf3wiTwizJrK0tdO09IegCups0ir2/iXjbQgZZ7VLt0cq8eaL TXxr+kLG1xkEb0ehXHmOmrQekCqBPKqyvIlFSQuX3x0cN8Qt5vU2/rcoTHeclQRHbsuF B/uE2kxCpAfBfLupIeyJXexvecvBuUnJKI8ORi3nMZG5EGDITLd9sxvC0GOCAbER0b4e UGbGYofLgKfAuDh3d+hQoIi0Ra9a5M54onGwdH+G0JLVPFahrxM43QWTthN4z8STwX3J uwLDfEbO0zQHvH/Zxc0+oUOso7fytR9NRyxP/Dutspeh23W7EQTwHQuRsn5taPI6BeuY PUAg== X-Gm-Message-State: AOAM532GVMf9ugxOZwbiVFIgKNHqB1oEqpFmPJAUEAvpP5rOK0tIv+jh cjmI60gCTRDNPpLbf2jf5hNou6NlxXRwhg== X-Google-Smtp-Source: ABdhPJwg4iwsL/ZOcL8Sl9bsMpqDOusCSvezJ3CFgRLxM5r0v7trb9cj4l8LzPjlOU3K1mZ0IaBGNg== X-Received: by 2002:ac8:4b4e:: with SMTP id e14mr9382886qts.25.1614962170000; Fri, 05 Mar 2021 08:36:10 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id b10sm2168494qtt.23.2021.03.05.08.36.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 08:36:09 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Mar 2021 13:33:26 -0300 Message-Id: <20210305163339.63164-36-jamrial@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305163339.63164-1-jamrial@gmail.com> References: <20210305163339.63164-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 35/48] avfilter/vf_mcdeint: 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_mcdeint.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_mcdeint.c b/libavfilter/vf_mcdeint.c index bc7b3230d3..1cad45cd4e 100644 --- a/libavfilter/vf_mcdeint.c +++ b/libavfilter/vf_mcdeint.c @@ -74,6 +74,7 @@ typedef struct MCDeintContext { int mode; ///< MCDeintMode int parity; ///< MCDeintParity int qp; + AVPacket *pkt; AVCodecContext *enc_ctx; } MCDeintContext; @@ -112,6 +113,9 @@ static int config_props(AVFilterLink *inlink) return AVERROR(EINVAL); } + mcdeint->pkt = av_packet_alloc(); + if (!mcdeint->pkt) + return AVERROR(ENOMEM); mcdeint->enc_ctx = avcodec_alloc_context3(enc); if (!mcdeint->enc_ctx) return AVERROR(ENOMEM); @@ -154,6 +158,7 @@ static av_cold void uninit(AVFilterContext *ctx) { MCDeintContext *mcdeint = ctx->priv; + av_packet_free(&mcdeint->pkt); avcodec_free_context(&mcdeint->enc_ctx); } @@ -173,7 +178,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpic) MCDeintContext *mcdeint = inlink->dst->priv; AVFilterLink *outlink = inlink->dst->outputs[0]; AVFrame *outpic, *frame_dec; - AVPacket pkt = {0}; + AVPacket *pkt = mcdeint->pkt; int x, y, i, ret, got_frame = 0; outpic = ff_get_video_buffer(outlink, outlink->w, outlink->h); @@ -184,9 +189,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpic) av_frame_copy_props(outpic, inpic); inpic->quality = mcdeint->qp * FF_QP2LAMBDA; - av_init_packet(&pkt); - - ret = avcodec_encode_video2(mcdeint->enc_ctx, &pkt, inpic, &got_frame); + ret = avcodec_encode_video2(mcdeint->enc_ctx, pkt, inpic, &got_frame); if (ret < 0) goto end; @@ -274,7 +277,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpic) mcdeint->parity ^= 1; end: - av_packet_unref(&pkt); + av_packet_unref(pkt); av_frame_free(&inpic); if (ret < 0) { av_frame_free(&outpic);