From patchwork Sun Mar 19 19:42:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40726 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1274903pzb; Sun, 19 Mar 2023 12:42:52 -0700 (PDT) X-Google-Smtp-Source: AK7set+wGAb/yv1OOdyxVWCUX3498waWLpruL9xt53VWtSB0Ag16dj5ETY6SJZh9kkE0yIosx8Mp X-Received: by 2002:aa7:d31a:0:b0:4ac:b760:f07a with SMTP id p26-20020aa7d31a000000b004acb760f07amr10838884edq.19.1679254972559; Sun, 19 Mar 2023 12:42:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679254972; cv=none; d=google.com; s=arc-20160816; b=Bn4CKKpgu9qFRQJsTnDQCFYkzee/ldrdJPyKKOTh0IVA5RRodOWzcSKsZkkHpWKIyg gkqjkvKguWj2Y6Jt0cMFMS6RCOtiFGk9BFSb7kpaaKXxzv3xOAbXN/U1ZNAoJs7b2XBu r2GX194iPlNteK5SGLqMwhyT9xOhjnwFgxEjed+Ty+R/0WUUDFXnwsSjpXyJ0npZX5FI +pgMSbq8NHAdbBCaJmgVZ/sbJ+jvxkihPVn16NGr0lOAIBvG2h8chR/HT07mKd2Ii5cC ddGgkSPX9UBVP2LKb2jGR7GYCq2ngLfSqHgaVINHSVAfajhGtZY7JgZ3FS5nVDpp/cgs GdBw== 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:message-id:date:to:from:delivered-to; bh=4DW2uH6V35bj3CukoDlJ7WySYprswCb4hv7EYB3m8UM=; b=OC+CXbKcBx3m7SgklXVM7crcD3pVrGZR+RUOa73G4pHbJJJueXtokcgHHg5sOXfe0v HsUWQZQFssoBXEtoriH2u9gUH97Kiy3B+nFCmjajJio6DCJtFb0UB8YOe97GqhZAy0Qb cL2KCWqR6UEW0CTnG8CeI80kLSohnLrr0UdCebOlGoakyvOQJKA3d4LZR7WqoKP4MqxN xR+/SBR12sG/Isi1hiJqmlY2obqzaGkjHt4aC0ziBqpBnRYQCHspR8AsEJxPTLvesC9b FO5ZNsvxYvuWzUVuFEM+zvaaiSjKLWeXgYPyqUXtZ/HtHaUy8U8Cwc6gfdMyFQVkENAH aIbw== 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 e9-20020a056402148900b0050050f6e7a6si5109920edv.602.2023.03.19.12.42.52; Sun, 19 Mar 2023 12:42:52 -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 332E668C3F8; Sun, 19 Mar 2023 21:42:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75B7768C25B for ; Sun, 19 Mar 2023 21:42:43 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 865FB240003 for ; Sun, 19 Mar 2023 19:42:42 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 19 Mar 2023 20:42:38 +0100 Message-Id: <20230319194240.15001-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v2 1/3] avcodec/snowenc: AV_CODEC_CAP_ENCODER_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: K20iFEPJU65R Signed-off-by: Michael Niedermayer --- libavcodec/snowenc.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 658684c575..5fb5906ed8 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -26,6 +26,7 @@ #include "avcodec.h" #include "codec_internal.h" #include "encode.h" +#include "internal.h" //For AVCodecInternal.recon_frame #include "me_cmp.h" #include "packet_internal.h" #include "snow_dwt.h" @@ -1576,6 +1577,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, { SnowContext *s = avctx->priv_data; RangeCoder * const c= &s->c; + AVCodecInternal *avci = avctx->internal; AVFrame *pic; const int width= s->avctx->width; const int height= s->avctx->height; @@ -1877,6 +1879,10 @@ redo_frame: s->encoding_error, (s->avctx->flags&AV_CODEC_FLAG_PSNR) ? SNOW_MAX_PLANES : 0, s->current_picture->pict_type); + if (s->avctx->flags & AV_CODEC_FLAG_RECON_FRAME) { + av_frame_unref(avci->recon_frame); + av_frame_ref(avci->recon_frame, s->current_picture); + } pkt->size = ff_rac_terminate(c, 0); if (s->current_picture->key_frame) @@ -1934,7 +1940,9 @@ const FFCodec ff_snow_encoder = { CODEC_LONG_NAME("Snow"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SNOW, - .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, + .p.capabilities = AV_CODEC_CAP_DR1 | + AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE | + AV_CODEC_CAP_ENCODER_RECON_FRAME, .priv_data_size = sizeof(SnowContext), .init = encode_init, FF_CODEC_ENCODE_CB(encode_frame), From patchwork Sun Mar 19 19:42:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40727 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1274969pzb; Sun, 19 Mar 2023 12:43:00 -0700 (PDT) X-Google-Smtp-Source: AK7set9z08hykD6kV+qKbkd4W7h2H4tZTFSk4kYVXIdmKjo4FNsJNrsFpBe1YbLNreaw5v746w4y X-Received: by 2002:a17:906:4d91:b0:931:a0cb:1ef1 with SMTP id s17-20020a1709064d9100b00931a0cb1ef1mr6558660eju.7.1679254980751; Sun, 19 Mar 2023 12:43:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679254980; cv=none; d=google.com; s=arc-20160816; b=zCSIgmEfiOj0a/TyeLdk2BOVwKhyAfZgv5cDethA2AAP+8mq9gkvqAMAVObvQc7Qq5 5d98hDiB+v2AxJOjaBlWeh76x67NZAgtia3NqXKFNyhvIrczgYLvSf/uf2QapAnyDTyh ie/b0UWnoKTIKH7D8i1y1tYueebpYu9K7l/+Cykav1Gc0MIOWE4AihDa6nH8newWcAI2 /J3ZS8TSZkPpp9Gh+LriIIYidmfp2poKPpgESlRUHshmfpvcD186ErJe+pjHhEZlEYpg Afr6RobZhtrBDGwpmuolJO9Pyzqr+Sd3jjMgeX97HrJ75QFKfHxbKTotGRobgVxPP4g9 nUPw== 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=gxoWIYiE6/URFpWmDCN7oTSqnYHS86gwNIzCfvajSZA=; b=L7942bO4utVgLwZzgJ0JMt0aEU3XIp/6on8vYY17LJ8zUUEecY7heR2dXnXHMBBofh X1SsM4n43DeIqBukv/+VWc4YnUi+Gwzj1tvQl1dN6VgISePtJkK+5JkjSWvSJ4S71Jrg 1aJI+n3MgPK1FkGZOf+fFkNreV3UdeITyDX8SyqMgBFKS0c9OUcVSKuen0zhVen1MqU9 s9YN/QfpS0Q7PUQVDQHlrDgUJk+qUbjYZVEHQ4O4J/IwcCPR8F0IemFJBxiFzrjRJ6qN 7NcKD18z3uqBKT2hXFIxw2oQoGVr/okne8IWecIf0ccq6sJQ1t4P6xbZt2oSV7hMvw6x /O4A== 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 q17-20020a170906361100b00932b536587csi6014140ejb.354.2023.03.19.12.43.00; Sun, 19 Mar 2023 12:43:00 -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 3C64368C403; Sun, 19 Mar 2023 21:42:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E94AE68C3FD for ; Sun, 19 Mar 2023 21:42:48 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id B314220004 for ; Sun, 19 Mar 2023 19:42:46 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 19 Mar 2023 20:42:39 +0100 Message-Id: <20230319194240.15001-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230319194240.15001-1-michael@niedermayer.cc> References: <20230319194240.15001-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH v2 2/3] 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: 3YFe6tgh8I6K about 50% faster (based on command line fps) Signed-off-by: Michael Niedermayer --- libavfilter/vf_uspp.c | 53 +++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index f60eb230a2..ffdaa907b2 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]; @@ -383,23 +392,21 @@ static int config_input(AVFilterLink *inlink) if (!(uspp->avctx_enc[i] = avcodec_alloc_context3(NULL))) return AVERROR(ENOMEM); - if (!(uspp->avctx_dec[i] = avcodec_alloc_context3(NULL))) - return AVERROR(ENOMEM); avctx_enc = uspp->avctx_enc[i]; - avctx_dec = uspp->avctx_dec[i]; - avctx_dec->width = avctx_enc->width = width + BLOCK; - avctx_dec->height = avctx_enc->height = height + BLOCK; avctx_enc->time_base = (AVRational){1,25}; // meaningless avctx_enc->gop_size = INT_MAX; 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 = avctx_enc->thread_count = 1; // We do threading in the filter with muiltiple codecs ret = avcodec_open2(avctx_enc, enc, &opts); av_dict_free(&opts); @@ -408,9 +415,17 @@ 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)) { + if (!(uspp->avctx_dec[i] = avcodec_alloc_context3(NULL))) + return AVERROR(ENOMEM); + avctx_dec = uspp->avctx_dec[i]; + avctx_dec->width = avctx_enc->width; + avctx_dec->height = avctx_enc->height; + avctx_dec->thread_count = 1; + ret = avcodec_open2(avctx_dec, dec, NULL); + if (ret < 0) + return ret; + } if (!(uspp->frame[i] = av_frame_alloc())) return AVERROR(ENOMEM); From patchwork Sun Mar 19 19:42:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40728 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1275049pzb; Sun, 19 Mar 2023 12:43:08 -0700 (PDT) X-Google-Smtp-Source: AK7set/IlxFo2MNCCP776cQLuTqYEUilOio9E4lC8PmywGzDiPb1d+zo+CLvg4cq76NvyI4TrnKq X-Received: by 2002:a17:906:4c52:b0:931:6921:bdb7 with SMTP id d18-20020a1709064c5200b009316921bdb7mr6677019ejw.60.1679254988416; Sun, 19 Mar 2023 12:43:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679254988; cv=none; d=google.com; s=arc-20160816; b=w2uMb1aE79hGqry2mfw4f2tHT+u0lmmFYH3PXyDToWplNAo4P4dyESchM3lTbUYz2Y OAVvkqn/CFdiQOUogdL4wa9CrYTodEbnsEeN4bCn7o1HdtM9d1/vgyng2UVSEpQGQGd5 Xmg1+cUC9Ma6dg70AMsaxbyTJ03XMahVt/Hxsja1cGhwOgdOWt0nbHaSzWnirseFvZtq usw6ExvfRxlFFWNKLqZOZEMDiyoJJijs1408kv/P9WLeOWPakprTt8Oi5FHnVFND2YB/ uB7M4K4Q9Undta0t+oRSqViyr+1niRXulCGbU7W8g8WDqLArwiJZF94qVZzSxkpa4Ukh w8Lg== 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=PL+BBBT/gGw0AYZtjmUYRgbE+qfbd1GEXNfZhiEf0EU=; b=dmOKf6QsGU9Kj1Idna1DXvVSFphojrYWCqzv29sS5wM+Bajx25UbL0Mdd/5ASnZMD9 DDJnoPk8F7pBuWSWdnwZF3JSgByn4CYMN51vMjg507BCHmdHFoOhMOYguloGRpKuEIwo PP9qsHm+zq7m9/xgE18z8YnfredsN8dgZvm04PA0eNAIe6xozP4n4NwLJd9aVi0au4i1 J9ergNDkUdcsXS2a0PIHtlzdFUNfluQgX+M//+UapH8Y8SmZSCpy/qP+CohGgXCE8VMH KuYG+a2dXCEcxt5o31U75rnasDHLnqJ9kZ9kIXwsBoOKJIw4J2tW6TM4ax0oLmINLHRt buiA== 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 gt39-20020a1709072da700b0093337d30dadsi5936294ejc.522.2023.03.19.12.43.08; Sun, 19 Mar 2023 12:43:08 -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 47AD568C3F5; Sun, 19 Mar 2023 21:42:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73B8068C409 for ; Sun, 19 Mar 2023 21:42:52 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 590961BF203 for ; Sun, 19 Mar 2023 19:42:50 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 19 Mar 2023 20:42:40 +0100 Message-Id: <20230319194240.15001-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230319194240.15001-1-michael@niedermayer.cc> References: <20230319194240.15001-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH v2 3/3] avfilter/vf_mcdeint: update to new API 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: 8IbbZJ6lO8Tr Signed-off-by: Michael Niedermayer --- configure | 5 ----- doc/filters.texi | 2 -- libavfilter/vf_mcdeint.c | 30 +++++++++++++++++++++++------- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 0370e25577..07b94e5e7c 100755 --- a/configure +++ b/configure @@ -7355,11 +7355,6 @@ esac enable frame_thread_encoder -# these filters depend on removed avcodec APIs -# they are kept disabled for now, but will be removed if -# nobody updates and re-enables them -disable mcdeint_filter - enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; } check_deps $CONFIG_LIST \ diff --git a/doc/filters.texi b/doc/filters.texi index d634924bfb..59c1faa0b4 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -16988,8 +16988,6 @@ Apply motion-compensation deinterlacing. It needs one field per frame as input and must thus be used together with yadif=1/3 or equivalent. -This filter is only available in ffmpeg version 4.4 or earlier. - This filter accepts the following options: @table @option @item mode diff --git a/libavfilter/vf_mcdeint.c b/libavfilter/vf_mcdeint.c index e747521c0a..a2c3e79b9e 100644 --- a/libavfilter/vf_mcdeint.c +++ b/libavfilter/vf_mcdeint.c @@ -75,6 +75,7 @@ typedef struct MCDeintContext { int parity; ///< MCDeintParity int qp; AVPacket *pkt; + AVFrame *frame_dec; AVCodecContext *enc_ctx; } MCDeintContext; @@ -116,6 +117,9 @@ static int config_props(AVFilterLink *inlink) mcdeint->pkt = av_packet_alloc(); if (!mcdeint->pkt) return AVERROR(ENOMEM); + mcdeint->frame_dec = av_frame_alloc(); + if (!mcdeint->frame_dec) + return AVERROR(ENOMEM); mcdeint->enc_ctx = avcodec_alloc_context3(enc); if (!mcdeint->enc_ctx) return AVERROR(ENOMEM); @@ -126,7 +130,7 @@ static int config_props(AVFilterLink *inlink) enc_ctx->gop_size = INT_MAX; enc_ctx->max_b_frames = 0; enc_ctx->pix_fmt = AV_PIX_FMT_YUV420P; - enc_ctx->flags = AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_LOW_DELAY; + enc_ctx->flags = AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_LOW_DELAY | AV_CODEC_FLAG_RECON_FRAME; enc_ctx->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; enc_ctx->global_quality = 1; enc_ctx->me_cmp = enc_ctx->me_sub_cmp = FF_CMP_SAD; @@ -160,15 +164,16 @@ static av_cold void uninit(AVFilterContext *ctx) av_packet_free(&mcdeint->pkt); avcodec_free_context(&mcdeint->enc_ctx); + av_frame_free(&mcdeint->frame_dec); } static int filter_frame(AVFilterLink *inlink, AVFrame *inpic) { MCDeintContext *mcdeint = inlink->dst->priv; AVFilterLink *outlink = inlink->dst->outputs[0]; - AVFrame *outpic, *frame_dec; + AVFrame *outpic, *frame_dec = mcdeint->frame_dec; AVPacket *pkt = mcdeint->pkt; - int x, y, i, ret, got_frame = 0; + int x, y, i, ret; outpic = ff_get_video_buffer(outlink, outlink->w, outlink->h); if (!outpic) { @@ -178,11 +183,22 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpic) av_frame_copy_props(outpic, inpic); inpic->quality = mcdeint->qp * FF_QP2LAMBDA; - ret = avcodec_encode_video2(mcdeint->enc_ctx, pkt, inpic, &got_frame); - if (ret < 0) + ret = avcodec_send_frame(mcdeint->enc_ctx, inpic); + if (ret < 0) { + av_log(mcdeint->enc_ctx, AV_LOG_ERROR, "Error sending a frame for encoding\n"); goto end; - - frame_dec = mcdeint->enc_ctx->coded_frame; + } + ret = avcodec_receive_packet(mcdeint->enc_ctx, pkt); + if (ret < 0) { + av_log(mcdeint->enc_ctx, AV_LOG_ERROR, "Error receiving a packet from encoding\n"); + goto end; + } + av_packet_unref(pkt); + ret = avcodec_receive_frame(mcdeint->enc_ctx, frame_dec); + if (ret < 0) { + av_log(mcdeint->enc_ctx, AV_LOG_ERROR, "Error receiving a frame from encoding\n"); + goto end; + } for (i = 0; i < 3; i++) { int is_chroma = !!i;