From patchwork Thu Feb 4 19:09:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25425 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 791D244A506 for ; Thu, 4 Feb 2021 21:14:45 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D843E68AA07; Thu, 4 Feb 2021 21:11:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E5B8568A9A5 for ; Thu, 4 Feb 2021 21:11:42 +0200 (EET) Received: by mail-qv1-f45.google.com with SMTP id a1so2232330qvd.13 for ; Thu, 04 Feb 2021 11:11:42 -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=pIOo5cHrhoExhzmJCs3/PHa7t7m8yJC5s+sVBEb3bSM=; b=SdDvrLji7VnXrZ30qQkUXmiwrAV+941Y2KPmnO48I4gLEgNs/LMHcBbtZDWZCfSLWW 8I1uf3y+bjyGgP5eWRVQL5ymWMStGW4QQvOVjmqEOt5IWi++Yhw1QuQO3Xty5XhfN9i/ Y4p4Zdq1jBT6hzxB7Hx3wLs7gekaUFiQnisc5178cy7JBJ510IC3FQihTtLu9qiIV6Qs pj8DN0MmnFZarOq3QUQvMYbRKvHCjYgI+vktndmqfPlI/Tm0fkvN6gAbgyZmSbSWXq0N BJw4kvK30xmCq3tsxU14xAXpLSHogE/WidQU1wmes+RVmqMM5tbvGUq/0fNcfhnzYFbu jm/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=pIOo5cHrhoExhzmJCs3/PHa7t7m8yJC5s+sVBEb3bSM=; b=ZFrqOo3RKIQExBdQfpFbtvL+iTG5tqvolxtdYrg9cdM2r6dF4Njk9DxFvx5djaq60c sITzHMABqP64AzK1p5RVsx8JmXyz8YOLs45jBhArk7tcpCNkY34ceVqXb73NTV1g95tH 4XiGzQrXRUZs5irAiBgsvDZNLU4X0RaxOrZoL2COEwAojOEVH0pejoNftFXxKg5H+lEP BcDzesh8mwvKrb3MYuy2SUHPqzrdFqbShz3hUfVR0XDbjmlLfM7WMmepz00dfaq5MSJN 6afnRmGO/crhnJAti63cbyuRJ1TdtNLFJa13mcY0M2upuJhhnWDwkoEaS/z9ZfYdqYsc v20g== X-Gm-Message-State: AOAM532eUkM3ZKPFjLPUwUkh1pW2IY7OZzKKXVDztO9ZS9xeZUcuZZAr W01hVOmmctdQHcv14kFvh21zznt4ELQ= X-Google-Smtp-Source: ABdhPJyinwNRSCltWJZ9rGIVsgMSiHHtVCrv7/pofCvC1QR4wnKlyrBBUqfJwZSMoCbzWAbse6497g== X-Received: by 2002:a0c:a5a5:: with SMTP id z34mr888040qvz.59.1612465901361; Thu, 04 Feb 2021 11:11:41 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.11.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:11:40 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:51 -0300 Message-Id: <20210204191005.48190-37-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 36/50] 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, 9 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_mcdeint.c b/libavfilter/vf_mcdeint.c index bc7b3230d3..26baf94adb 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,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpic) av_frame_copy_props(outpic, inpic); inpic->quality = mcdeint->qp * FF_QP2LAMBDA; - av_init_packet(&pkt); + av_packet_unref(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 +279,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);