From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 9EEF64D9BE for <ffmpegdev@gitmailbox.com>; Mon, 2 Jun 2025 23:27:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 90AB968DFA8; Tue, 3 Jun 2025 02:27:41 +0300 (EEST) Received: from mail-oo1-f45.google.com (mail-oo1-f45.google.com [209.85.161.45]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 6B1B268DF5F for <ffmpeg-devel@ffmpeg.org>; Tue, 3 Jun 2025 02:27:35 +0300 (EEST) Received: by mail-oo1-f45.google.com with SMTP id 006d021491bc7-60be8b6f1e2so2552951eaf.1 for <ffmpeg-devel@ffmpeg.org>; Mon, 02 Jun 2025 16:27:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748906854; x=1749511654; darn=ffmpeg.org; h=in-reply-to:content-language:references:to:from:subject:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=3bsh3lsHHMA5whZNf/9bam5yUcFrLb3aqRm/SxDfdIQ=; b=bMOxRUSqUAvoQHZHcmv2PgeX9Vjj8M2kJ4b9ZHUiPLvfrdnxMJ05GSfSWMjdEkPvkW +SsgJWwBrKjj5H0N6eDIRMchgBWwMTwIBUbt4ImPTirU8bEZmZ/0ZFIglNWwLdQZwrZW 3kYK00ONTfbqtDKqc6T76xkMGfI0YUCdquW2jwE+/l3HTZZGA4FMFLyqDkmd9njXYoSH mCYPDpesNHfkbEGmWkoojSoc+pDiN0fMIIjDYMbbOfoG0bzkr4Q8ckcWEmW7PVFkhV5y DSZiO27zP8Bgs31oyYjFKrh2TK/B1rkNL+sOk4d6f4i5rJhCiazxOQ4yJdEEr6YPHNGU Hdxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748906854; x=1749511654; h=in-reply-to:content-language:references:to:from:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=3bsh3lsHHMA5whZNf/9bam5yUcFrLb3aqRm/SxDfdIQ=; b=TXOME8aSkxqm+5FyVYWTgTcOpTV2X9IEp1IS9DZ+wCr8tLq4kdPL5JwsIpPEDcD0CM E1uiKaliNfD5EtAtWUDJi7dNyMBRs9baB/WnksMDekfS7POBbM5pgoWpnb8ZEVuNr2Ru iIg0oZKSwz8UsipsXPJozn4CtBfcZDaVfoskHzHaqhq8BP+KBRpzGfFqZkDBvgPj2ySN lToMeprMvfGUsJ65lfhWs+58beQMaDRuqenK3eTtMbq4mK2DDMxYrBno8C4nmVlt/4eq sAJz7pPg0DwOZHLazVaC21c34Hi9zyTWiy4OKoVhxOZAqG+X0+q7g13JE1get94fgaqy wvag== X-Gm-Message-State: AOJu0Yxu1MqOY9Vg3JZlisKrm8uAYdvY0PkOhG6C7LXWqWLPSMg5KrbB SJiTW6GiWBTChrNATovxcdVl1t1pTTEPUvPA7zOkMUz0ZNSdkmLdgqz3EXsgW7Nc X-Gm-Gg: ASbGncsCccvDtYz0ysodqaxMKsogRRYUyj4b1OJuQ0322RehXK3rU/Xp7DBEU0Etqgc 0WhrRt7gToa5GqV9Jft6S4RmIX6Wp0rJc/0aFHu0rk0UyvUuWT5NhEuMNP4ut6HdcGEcs3I8MFr HfL3L4/tg5Owtimsp14YiySmwGhkvIB6CAHi1+0R3KEDVIvFFPfCbC551HISrqVO2YZOjz1bRB5 BzQkK78ZeSUXr04VdCpn4vNClK1zPC45iNdo3ZW+WtJSqpgxw0S7uwWo4MI6XMomw8rOXQHEAhf dvIdE1YeUWv/oiMbORbJaYwKccHFNwckfwU+/atOuweFzuS6ntCdJM9oz/0= X-Google-Smtp-Source: AGHT+IFwzZLQdBNqgJJJ/P5MY3w2hS0LNCuKLt8KXK26ow2RA0mDm4DdZMNCxb5Qw0prniX5evPGGA== X-Received: by 2002:a05:6820:c8c:b0:60b:f041:7a09 with SMTP id 006d021491bc7-60db9e528femr7411933eaf.3.1748906853440; Mon, 02 Jun 2025 16:27:33 -0700 (PDT) Received: from [192.168.1.30] ([97.125.40.144]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-60c14c427d2sm1603925eaf.4.2025.06.02.16.27.32 for <ffmpeg-devel@ffmpeg.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 02 Jun 2025 16:27:32 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------00XhC27vhjT00z8uRxfmJ09A" Message-ID: <83b47c81-f98d-4f01-b9b6-f56038f7e3a9@gmail.com> Date: Mon, 2 Jun 2025 18:27:32 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Ethan Halsall <ethanshalsall@gmail.com> To: ffmpeg-devel@ffmpeg.org References: <90c31845-ef4f-4aa2-b87d-93800e1a469b@gmail.com> <20250530005839.GG29660@pb2> <e3d5d3b6-b379-4cc0-accb-dd3faf7de251@gmail.com> Content-Language: en-US In-Reply-To: <e3d5d3b6-b379-4cc0-accb-dd3faf7de251@gmail.com> Subject: Re: [FFmpeg-devel] [PATCH] add yuv444p support to mcdeint X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> Archived-At: <https://master.gitmailbox.com/ffmpegdev/83b47c81-f98d-4f01-b9b6-f56038f7e3a9@gmail.com/> List-Archive: <https://master.gitmailbox.com/ffmpegdev/> List-Post: <mailto:ffmpegdev@gitmailbox.com> This is a multi-part message in MIME format. --------------00XhC27vhjT00z8uRxfmJ09A Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Just a friendly follow up on this patch. I've attached the patch in case something else was wrong with the formatting with my previous reply. Ethan On 5/30/25 12:29 AM, Ethan Halsall wrote: > On 5/29/25 7:58 PM, Michael Niedermayer wrote: >> On Tue, May 27, 2025 at 01:24:57PM -0500, Ethan Halsall wrote: >>> Signed-off-by: Ethan Halsall <ethanhalsall11@augustana.edu> >>> --- >>>  libavfilter/vf_mcdeint.c | 32 ++++++++++++++++++++++++++++---- >>>  1 file changed, 28 insertions(+), 4 deletions(-) >>> >> >> Applying: add yuv444p support to mcdeint >> error: corrupt patch at line 18 >> >> this patch is somehow corrupted, that above is not a valid diff >> make sure the output of git format-patch is not modified >> >> thx >> >> >> [...] >> > > I followed the instructions on the "Sending patches from email clients" > section of https://ffmpeg.org/developer.html#Submitting-patches-1. I > think Thunderbird removed some line breaks in the patch though when I > opened the .eml file. > > Let's try this one: > > > Signed-off-by: Ethan Halsall <ethanhalsall11@augustana.edu> > --- >  libavfilter/vf_mcdeint.c | 32 ++++++++++++++++++++++++++++---- >  1 file changed, 28 insertions(+), 4 deletions(-) > > diff --git a/libavfilter/vf_mcdeint.c b/libavfilter/vf_mcdeint.c > index 82048b51d0..11ad19f5cd 100644 > --- a/libavfilter/vf_mcdeint.c > +++ b/libavfilter/vf_mcdeint.c > @@ -51,8 +51,10 @@ > >  #include "libavutil/opt.h" >  #include "libavcodec/avcodec.h" > +#include "libavutil/pixdesc.h" >  #include "avfilter.h" >  #include "filters.h" > +#include "formats.h" >  #include "video.h" > >  enum MCDeintMode { > @@ -76,6 +78,7 @@ typedef struct MCDeintContext { >     AVPacket *pkt; >     AVFrame *frame_dec; >     AVCodecContext *enc_ctx; > +   const AVPixFmtDescriptor *pix_fmt_desc; >  } MCDeintContext; > >  #define OFFSET(x) offsetof(MCDeintContext, x) > @@ -99,6 +102,17 @@ static const AVOption mcdeint_options[] = { > >  AVFILTER_DEFINE_CLASS(mcdeint); > > +static const enum AVPixelFormat pix_fmts[] = { > +   AV_PIX_FMT_YUV420P, > +   AV_PIX_FMT_YUV444P, > +   AV_PIX_FMT_NONE > +}; > + > +static int query_formats(AVFilterContext *ctx) > +{ > +   return ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); > +} > + >  static int config_props(AVFilterLink *inlink) >  { >     AVFilterContext *ctx = inlink->dst; > @@ -122,13 +136,16 @@ static int config_props(AVFilterLink *inlink) >     mcdeint->enc_ctx = avcodec_alloc_context3(enc); >     if (!mcdeint->enc_ctx) >         return AVERROR(ENOMEM); > +   mcdeint->pix_fmt_desc = av_pix_fmt_desc_get(inlink->format); > +   if (!mcdeint->pix_fmt_desc) > +       return AVERROR(ENOMEM); >     enc_ctx = mcdeint->enc_ctx; >     enc_ctx->width = inlink->w; >     enc_ctx->height = inlink->h; >     enc_ctx->time_base = (AVRational){1,25}; // meaningless >     enc_ctx->gop_size = INT_MAX; >     enc_ctx->max_b_frames = 0; > -   enc_ctx->pix_fmt = AV_PIX_FMT_YUV420P; > +   enc_ctx->pix_fmt = inlink->format; >     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; > @@ -201,8 +218,14 @@ static int filter_frame(AVFilterLink *inlink, > AVFrame *inpic) > >     for (i = 0; i < 3; i++) { >         int is_chroma = !!i; > -       int w = AV_CEIL_RSHIFT(inlink->w, is_chroma); > -       int h = AV_CEIL_RSHIFT(inlink->h, is_chroma); > +       int w, h; > +       if (is_chroma) { > +           w = inlink->w >> mcdeint->pix_fmt_desc->log2_chroma_w; > +           h = inlink->h >> mcdeint->pix_fmt_desc->log2_chroma_h; > +       } else { > +           w = inlink->w; > +           h = inlink->h; > +       } >         int fils = frame_dec->linesize[i]; >         int srcs = inpic   ->linesize[i]; >         int dsts = outpic  ->linesize[i]; > @@ -307,5 +330,6 @@ const FFFilter ff_vf_mcdeint = { >     .uninit       = uninit, >     FILTER_INPUTS(mcdeint_inputs), >     FILTER_OUTPUTS(ff_video_default_filterpad), > -   FILTER_SINGLE_PIXFMT(AV_PIX_FMT_YUV420P), > +   FILTER_QUERY_FUNC(query_formats), >  }; > + --------------00XhC27vhjT00z8uRxfmJ09A Content-Type: text/x-patch; charset=UTF-8; name="0001-add-yuv444p-support-to-mcdeint.patch" Content-Disposition: attachment; filename="0001-add-yuv444p-support-to-mcdeint.patch" Content-Transfer-Encoding: base64 RnJvbSAwNTYzMTQzZjIwZjEyN2Q3MTYyY2U4NTRmMDNhMDg3MDhjN2Y2NmNmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBFdGhhbiBIYWxzYWxsIDxldGhhbmhhbHNhbGwxMUBh dWd1c3RhbmEuZWR1PgpEYXRlOiBTdW4sIDI1IE1heSAyMDI1IDAwOjUxOjA1IC0wNTAwClN1 YmplY3Q6IFtQQVRDSF0gYWRkIHl1djQ0NHAgc3VwcG9ydCB0byBtY2RlaW50CgpTaWduZWQt b2ZmLWJ5OiBFdGhhbiBIYWxzYWxsIDxldGhhbmhhbHNhbGwxMUBhdWd1c3RhbmEuZWR1Pgot LS0KIGxpYmF2ZmlsdGVyL3ZmX21jZGVpbnQuYyB8IDMyICsrKysrKysrKysrKysrKysrKysr KysrKysrKystLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjggaW5zZXJ0aW9ucygrKSwgNCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWJhdmZpbHRlci92Zl9tY2RlaW50LmMgYi9saWJh dmZpbHRlci92Zl9tY2RlaW50LmMKaW5kZXggODIwNDhiNTFkMC4uMTFhZDE5ZjVjZCAxMDA2 NDQKLS0tIGEvbGliYXZmaWx0ZXIvdmZfbWNkZWludC5jCisrKyBiL2xpYmF2ZmlsdGVyL3Zm X21jZGVpbnQuYwpAQCAtNTEsOCArNTEsMTAgQEAKIAogI2luY2x1ZGUgImxpYmF2dXRpbC9v cHQuaCIKICNpbmNsdWRlICJsaWJhdmNvZGVjL2F2Y29kZWMuaCIKKyNpbmNsdWRlICJsaWJh dnV0aWwvcGl4ZGVzYy5oIgogI2luY2x1ZGUgImF2ZmlsdGVyLmgiCiAjaW5jbHVkZSAiZmls dGVycy5oIgorI2luY2x1ZGUgImZvcm1hdHMuaCIKICNpbmNsdWRlICJ2aWRlby5oIgogCiBl bnVtIE1DRGVpbnRNb2RlIHsKQEAgLTc2LDYgKzc4LDcgQEAgdHlwZWRlZiBzdHJ1Y3QgTUNE ZWludENvbnRleHQgewogICAgIEFWUGFja2V0ICpwa3Q7CiAgICAgQVZGcmFtZSAqZnJhbWVf ZGVjOwogICAgIEFWQ29kZWNDb250ZXh0ICplbmNfY3R4OworICAgIGNvbnN0IEFWUGl4Rm10 RGVzY3JpcHRvciAqcGl4X2ZtdF9kZXNjOwogfSBNQ0RlaW50Q29udGV4dDsKIAogI2RlZmlu ZSBPRkZTRVQoeCkgb2Zmc2V0b2YoTUNEZWludENvbnRleHQsIHgpCkBAIC05OSw2ICsxMDIs MTcgQEAgc3RhdGljIGNvbnN0IEFWT3B0aW9uIG1jZGVpbnRfb3B0aW9uc1tdID0gewogCiBB VkZJTFRFUl9ERUZJTkVfQ0xBU1MobWNkZWludCk7CiAKK3N0YXRpYyBjb25zdCBlbnVtIEFW UGl4ZWxGb3JtYXQgcGl4X2ZtdHNbXSA9IHsKKyAgICBBVl9QSVhfRk1UX1lVVjQyMFAsCisg ICAgQVZfUElYX0ZNVF9ZVVY0NDRQLAorICAgIEFWX1BJWF9GTVRfTk9ORQorfTsKKworc3Rh dGljIGludCBxdWVyeV9mb3JtYXRzKEFWRmlsdGVyQ29udGV4dCAqY3R4KQoreworICAgIHJl dHVybiBmZl9zZXRfY29tbW9uX2Zvcm1hdHMoY3R4LCBmZl9tYWtlX2Zvcm1hdF9saXN0KHBp eF9mbXRzKSk7Cit9CisKIHN0YXRpYyBpbnQgY29uZmlnX3Byb3BzKEFWRmlsdGVyTGluayAq aW5saW5rKQogewogICAgIEFWRmlsdGVyQ29udGV4dCAqY3R4ID0gaW5saW5rLT5kc3Q7CkBA IC0xMjIsMTMgKzEzNiwxNiBAQCBzdGF0aWMgaW50IGNvbmZpZ19wcm9wcyhBVkZpbHRlckxp bmsgKmlubGluaykKICAgICBtY2RlaW50LT5lbmNfY3R4ID0gYXZjb2RlY19hbGxvY19jb250 ZXh0MyhlbmMpOwogICAgIGlmICghbWNkZWludC0+ZW5jX2N0eCkKICAgICAgICAgcmV0dXJu IEFWRVJST1IoRU5PTUVNKTsKKyAgICBtY2RlaW50LT5waXhfZm10X2Rlc2MgPSBhdl9waXhf Zm10X2Rlc2NfZ2V0KGlubGluay0+Zm9ybWF0KTsKKyAgICBpZiAoIW1jZGVpbnQtPnBpeF9m bXRfZGVzYykKKyAgICAgICAgcmV0dXJuIEFWRVJST1IoRU5PTUVNKTsKICAgICBlbmNfY3R4 ID0gbWNkZWludC0+ZW5jX2N0eDsKICAgICBlbmNfY3R4LT53aWR0aCAgPSBpbmxpbmstPnc7 CiAgICAgZW5jX2N0eC0+aGVpZ2h0ID0gaW5saW5rLT5oOwogICAgIGVuY19jdHgtPnRpbWVf YmFzZSA9IChBVlJhdGlvbmFsKXsxLDI1fTsgIC8vIG1lYW5pbmdsZXNzCiAgICAgZW5jX2N0 eC0+Z29wX3NpemUgPSBJTlRfTUFYOwogICAgIGVuY19jdHgtPm1heF9iX2ZyYW1lcyA9IDA7 Ci0gICAgZW5jX2N0eC0+cGl4X2ZtdCA9IEFWX1BJWF9GTVRfWVVWNDIwUDsKKyAgICBlbmNf Y3R4LT5waXhfZm10ID0gaW5saW5rLT5mb3JtYXQ7CiAgICAgZW5jX2N0eC0+ZmxhZ3MgPSBB Vl9DT0RFQ19GTEFHX1FTQ0FMRSB8IEFWX0NPREVDX0ZMQUdfTE9XX0RFTEFZIHwgQVZfQ09E RUNfRkxBR19SRUNPTl9GUkFNRTsKICAgICBlbmNfY3R4LT5zdHJpY3Rfc3RkX2NvbXBsaWFu Y2UgPSBGRl9DT01QTElBTkNFX0VYUEVSSU1FTlRBTDsKICAgICBlbmNfY3R4LT5nbG9iYWxf cXVhbGl0eSA9IDE7CkBAIC0yMDEsOCArMjE4LDE0IEBAIHN0YXRpYyBpbnQgZmlsdGVyX2Zy YW1lKEFWRmlsdGVyTGluayAqaW5saW5rLCBBVkZyYW1lICppbnBpYykKIAogICAgIGZvciAo aSA9IDA7IGkgPCAzOyBpKyspIHsKICAgICAgICAgaW50IGlzX2Nocm9tYSA9ICEhaTsKLSAg ICAgICAgaW50IHcgPSBBVl9DRUlMX1JTSElGVChpbmxpbmstPncsIGlzX2Nocm9tYSk7Ci0g ICAgICAgIGludCBoID0gQVZfQ0VJTF9SU0hJRlQoaW5saW5rLT5oLCBpc19jaHJvbWEpOwor ICAgICAgICBpbnQgdywgaDsKKyAgICAgICAgaWYgKGlzX2Nocm9tYSkgeworICAgICAgICAg ICAgdyA9IGlubGluay0+dyA+PiBtY2RlaW50LT5waXhfZm10X2Rlc2MtPmxvZzJfY2hyb21h X3c7CisgICAgICAgICAgICBoID0gaW5saW5rLT5oID4+IG1jZGVpbnQtPnBpeF9mbXRfZGVz Yy0+bG9nMl9jaHJvbWFfaDsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIHcgPSBp bmxpbmstPnc7CisgICAgICAgICAgICBoID0gaW5saW5rLT5oOworICAgICAgICB9CiAgICAg ICAgIGludCBmaWxzID0gZnJhbWVfZGVjLT5saW5lc2l6ZVtpXTsKICAgICAgICAgaW50IHNy Y3MgPSBpbnBpYyAgICAtPmxpbmVzaXplW2ldOwogICAgICAgICBpbnQgZHN0cyA9IG91dHBp YyAgIC0+bGluZXNpemVbaV07CkBAIC0zMDcsNSArMzMwLDYgQEAgY29uc3QgRkZGaWx0ZXIg ZmZfdmZfbWNkZWludCA9IHsKICAgICAudW5pbml0ICAgICAgICA9IHVuaW5pdCwKICAgICBG SUxURVJfSU5QVVRTKG1jZGVpbnRfaW5wdXRzKSwKICAgICBGSUxURVJfT1VUUFVUUyhmZl92 aWRlb19kZWZhdWx0X2ZpbHRlcnBhZCksCi0gICAgRklMVEVSX1NJTkdMRV9QSVhGTVQoQVZf UElYX0ZNVF9ZVVY0MjBQKSwKKyAgICBGSUxURVJfUVVFUllfRlVOQyhxdWVyeV9mb3JtYXRz KSwKIH07CisKLS0gCjIuNDMuMAoK --------------00XhC27vhjT00z8uRxfmJ09A Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --------------00XhC27vhjT00z8uRxfmJ09A--