From patchwork Sun Mar 19 14:15:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40723 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1121662pzb; Sun, 19 Mar 2023 07:15:37 -0700 (PDT) X-Google-Smtp-Source: AK7set+tRBoZ8g57AyJrIQLWLwj4mHGsD2WdcmEg+OWhK8oNJniA7y5Pg+tboARNKZMSrCIBOfE/ X-Received: by 2002:a17:907:1114:b0:8e6:bcb6:469e with SMTP id qu20-20020a170907111400b008e6bcb6469emr6123229ejb.0.1679235337734; Sun, 19 Mar 2023 07:15:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679235337; cv=none; d=google.com; s=arc-20160816; b=CRC+HVtjelenfePMxMh8Fq1PgmvI11YwVjdphQF/POfVBxBQGKkUM1JVl8sW6HSUQS FcnC0wwQNuXwwRzWmaO9wNh7b7bFr/Gs19ES7ocLZ/8/2dbbNF10OyNy9hT/jbWt0s6Y DpxUbVd+IKgz1tD8QdRZRcud1xUZvorNGRhXepYrA1FA+z7nduJ7c7qsMa9Q9iJ4J0UD rKACo86zX4m8xZWEuu8wARR4BgiLkAHrAHe91gk30wARuoUSDgduDewqPQKhHAE3vsXW +aFs+ATT1/4r9bLLNAAg1luDsZoJcktoPo8yOkpDzcCMdOhy798IcZIvyXS4KuPEx9oQ ZFTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=4iRL8ogdNy8aqc/6/rgqTTpz2J/tAs2iQ1xcYApJDBE=; b=xfCich+LfIwEUm8JfJ58l0wJvmhhF+QDGF1+S1/zp+HYUSTzM72h2THA2F2ZdqOmeu IiFmR8/2NxEk78Ms92Zvh8lqhXtHPXvhcT4q/Z3dqGwnhXPa2/a9bc2VToouI9jurhC8 0quBqjcQGVyHqgH9jQyKK+K12MHhGDozN95fTpch6T2esvMC92Kd7UODP9Nxe4tWcAXw tqSXHRPymZMD//U5/+Yx2AbibrDGtNX4++Zp78KUU9XDtJ/ti5Z23zKwFOi9M4BKE5uv wexJTVutzvJ52UHgxx6Q7bA0egWSoLbY96ctFn2HXr/1wMQgDyMxOtHmFfqiJRoMy/zd NuKA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w12-20020a17090649cc00b00930d1b8e44dsi7307170ejv.345.2023.03.19.07.15.37; Sun, 19 Mar 2023 07:15:37 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 487FB68C313; Sun, 19 Mar 2023 16:15:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 055FE68C296 for ; Sun, 19 Mar 2023 16:15:16 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 24012FF802 for ; Sun, 19 Mar 2023 14:15:15 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 19 Mar 2023 15:15:14 +0100 Message-Id: <20230319141514.28134-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230319141514.28134-1-michael@niedermayer.cc> References: <20230319141514.28134-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_uspp: add AV_CODEC_FLAG_RECON_FRAME support 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KOQUiUglU4mM about 50% faster (based on command line fps) Signed-off-by: Michael Niedermayer --- libavfilter/vf_uspp.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index f60eb230a2..9318410089 100644 --- a/libavfilter/vf_uspp.c +++ b/libavfilter/vf_uspp.c @@ -231,16 +231,25 @@ static int filter_1phase(AVFilterContext *ctx, void *arg, int i, int nb_jobs) return ret; } - ret = avcodec_send_packet(p->avctx_dec[i], pkt); - av_packet_unref(pkt); - if (ret < 0) { - av_log(p->avctx_dec[i], AV_LOG_ERROR, "Error sending a packet for decoding\n"); - return ret; - } - ret = avcodec_receive_frame(p->avctx_dec[i], p->frame_dec[i]); - if (ret < 0) { - av_log(p->avctx_dec[i], AV_LOG_ERROR, "Error receiving a frame from decoding\n"); - return ret; + if (p->avctx_enc[i]->flags & AV_CODEC_FLAG_RECON_FRAME) { + av_packet_unref(pkt); + ret = avcodec_receive_frame(p->avctx_enc[i], p->frame_dec[i]); + if (ret < 0) { + av_log(p->avctx_dec[i], AV_LOG_ERROR, "Error receiving a frame from encoding\n"); + return ret; + } + } else { + ret = avcodec_send_packet(p->avctx_dec[i], pkt); + av_packet_unref(pkt); + if (ret < 0) { + av_log(p->avctx_dec[i], AV_LOG_ERROR, "Error sending a packet for decoding\n"); + return ret; + } + ret = avcodec_receive_frame(p->avctx_dec[i], p->frame_dec[i]); + if (ret < 0) { + av_log(p->avctx_dec[i], AV_LOG_ERROR, "Error receiving a frame from decoding\n"); + return ret; + } } offset = (BLOCK-x1) + (BLOCK-y1) * p->frame_dec[i]->linesize[0]; @@ -397,6 +406,10 @@ static int config_input(AVFilterLink *inlink) avctx_enc->max_b_frames = 0; avctx_enc->pix_fmt = inlink->format; avctx_enc->flags = AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_LOW_DELAY; + if (enc->capabilities & AV_CODEC_CAP_ENCODER_RECON_FRAME) { + avctx_enc->flags |= AV_CODEC_FLAG_RECON_FRAME; + av_dict_set(&opts, "no_bitstream", "1", 0); + } avctx_enc->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; avctx_enc->global_quality = 123; avctx_dec->thread_count = @@ -408,9 +421,11 @@ static int config_input(AVFilterLink *inlink) av_assert0(avctx_enc->codec); - ret = avcodec_open2(avctx_dec, dec, NULL); - if (ret < 0) - return ret; + if (!(enc->capabilities & AV_CODEC_CAP_ENCODER_RECON_FRAME)) { + ret = avcodec_open2(avctx_dec, dec, NULL); + if (ret < 0) + return ret; + } if (!(uspp->frame[i] = av_frame_alloc())) return AVERROR(ENOMEM);