From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 061AB4A063 for ; Mon, 18 Mar 2024 17:04:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4923C68D314; Mon, 18 Mar 2024 19:04:48 +0200 (EET) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 163B668D306 for ; Mon, 18 Mar 2024 19:04:42 +0200 (EET) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-6e6f6825102so3275987b3a.1 for ; Mon, 18 Mar 2024 10:04:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710781480; x=1711386280; darn=ffmpeg.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=HOYvls6l2+LSy/dJvh0qlBQjj+9OQZ/DMPdYgT5JbcE=; b=C08YCyzSG0ZlPY6JBSvbKgqqjXwX21KeI4Ld/QydYgrAIcUcGRslQzEdd6UjJNJ8J0 TdYknjnRdZPWNfFRw5e6+rB/8WCA9qIuq624y/Rd8A4kwGi3cRo6iViEPP962ObFL40A g4ztB2EI4UXQO/Mnwh0J2lilzx/SeohF5A8RG4aXmElCNjhGA14K2+Yl/O+GynNk6BCu 6Z1EdeBsDuGQrRDJO71BKSd3EJmJCgo7NpCvRR9RsTBpD/SpQUJn8AKnq4/pMV/bfR/l So692UsuQCOoNqFb39QDRLq3G1phxcxC3dPcZBadqZWiEziY3M8X4RSVzMQV7tSdMCC2 +byA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710781480; x=1711386280; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=HOYvls6l2+LSy/dJvh0qlBQjj+9OQZ/DMPdYgT5JbcE=; b=TnnY06hxdK7msrLxg1YUlBMAQfU3f6kyhOEiwWlPriHt8+kzhVTHFp9X6DGHKCyjD1 f+HeinoADN1Q0PYiC0WwXI+N1blyatjedDVfx7rS07OsicQ1OO2TPhE1yM2voOJQalkU 3LnD8L/0mn3EYg392F5md4CpFx18fxCifbCdafjJyo3ab3xxnohEgaIJpK9gpR6ch2+j pZ7klKdtt4Igr9r0qxRuIJRnXylMlSQdlIHKJznFJy+xDkO2VlygkRKWxwhUFfNK6/Y3 3z273slaSHtBGgeHb71hu/TEycXtyxXm0Xnm/HQMJj0RYrPF468X9peV4SDqu70mtgxN +FWQ== X-Gm-Message-State: AOJu0Yw8P4MKPhOG9D6MsjG68Buers/F/YBX6PfKMWMOgob8Ft2D4Raw sf0U4oD9By66A9h/ZBRDMITXZUyWk31OrDcVvJ9s4Hnu9ElYT2QSC7De6RZViaQ21O4GCXEBg15 HOcVpwSK7u2qhMNfcsFSKVfh3w8Q5bnQpDFMHfQ== X-Google-Smtp-Source: AGHT+IHpoivbprzSO/N7gJvp2dlBwdJwzISanv5MYgqt0xDAyegNktehPn8E28899JKf6iUWYQmlTVIfMMOUnFBbZEw= X-Received: by 2002:a17:90a:b701:b0:29c:5fef:f14d with SMTP id l1-20020a17090ab70100b0029c5feff14dmr175019pjr.39.1710781479909; Mon, 18 Mar 2024 10:04:39 -0700 (PDT) MIME-Version: 1.0 References: <79a25348-0193-4acb-8844-cd2dfaa73ac6@gmail.com> In-Reply-To: From: Poorva <2003gaikarpoorva@gmail.com> Date: Mon, 18 Mar 2024 22:34:25 +0530 Message-ID: To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="000000000000661ac00613f25a8f" Subject: Re: [FFmpeg-devel] Fixes #10509 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 Cc: Thilo Borgmann , Cosmin Stejerean Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --000000000000661ac00613f25a8f Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable > On Sun, Mar 17, 2024 at 12:26=E2=80=AFAM Marton Balint wrot= e: > > > > On Sun, 17 Mar 2024, Poorva wrote: > > > On Mon, Mar 11, 2024 at 1:10=E2=80=AFAM Leo Izen w= rote: > >> > >> On 3/9/24 15:49, Poorva wrote: > >>> I have attached the git patch containing the changes for your review. > >>> > >>> This patch is submitted as part of my qualification task for Google S= ummer > >>> of Code (GSoC) > >>> > >> > >> Your editor appears to have stripped the newline at the end of the fil= e. > > > diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c > > index 9b330a0673..965f5a0b54 100644 > > --- a/libavfilter/f_select.c > > +++ b/libavfilter/f_select.c > > @@ -90,6 +90,9 @@ static const char *const var_names[] =3D { > > > > "concatdec_select", ///< frame is within the interval set by the = concat demuxer > > > > + "ih", ///< ih: Represents the height of the input v= ideo frame. > > + "iw", ///< iw: Represents the width of the input vi= deo frame. > > + > > NULL > > }; > > > > @@ -144,6 +147,9 @@ enum var_name { > > > > VAR_CONCATDEC_SELECT, > > > > + VAR_IH, > > + VAR_IW, > > + > > VAR_VARS_NB > > }; > > > > @@ -264,6 +270,9 @@ static int config_input(AVFilterLink *inlink) > > select->var_values[VAR_CONSUMED_SAMPLES_N] =3D NAN; > > select->var_values[VAR_SAMPLES_N] =3D NAN; > > > > + select->var_values[VAR_IH] =3D inlink->h; > > + select->var_values[VAR_IW] =3D inlink->w; > > Initial valaues should be NAN. This may well be an audio filter, when > ih/iw is not available. > > > + > > select->var_values[VAR_SAMPLE_RATE] =3D > > inlink->type =3D=3D AVMEDIA_TYPE_AUDIO ? inlink->sample_rate := NAN; > > > > @@ -371,6 +380,9 @@ FF_ENABLE_DEPRECATION_WARNINGS > > break; > > } > > > > + select->var_values[VAR_IH] =3D frame->height; > > + select->var_values[VAR_IW] =3D frame->width; > > You shold only set these for the VIDEO case. > > > + > > select->select =3D res =3D av_expr_eval(select->expr, select->var_= values, NULL); > > av_log(inlink->dst, AV_LOG_DEBUG, > > "n:%f pts:%f t:%f key:%d", > > @@ -546,3 +558,4 @@ const AVFilter ff_vf_select =3D { > > .flags =3D AVFILTER_FLAG_DYNAMIC_OUTPUTS | AVFILTER_FLAG_M= ETADATA_ONLY, > > }; > > #endif /* CONFIG_SELECT_FILTER */ > > + > > Extra added line. > > > -- > > 2.43.0.windows.1 > > Documentation update missing. Sir, I have made the changes as per your suggestions: 1)Initial values are now set to NaN. 2)Values are only set for the VIDEO case. 3)Documentation has been updated to reflect these changes accurately. I have attached the patch with the updated code for your review. > Regards, > Marton > _______________________________________________ > 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". --000000000000661ac00613f25a8f Content-Type: application/octet-stream; name="v2-0001-avfilter-f_select.c-add-support-for-iw-and-ih-con.patch" Content-Disposition: attachment; filename="v2-0001-avfilter-f_select.c-add-support-for-iw-and-ih-con.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_ltx73you0 RnJvbSAwODc0YTU1YWQzM2JiNGRmMjc4OWNiYWZjNTI0N2MwYWUzZDk3ZTZhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQb29ydmFHYWlrYXIgPHBiZ2Fpa2FyX2IyMUBlbC52anRpLmFj LmluPgpEYXRlOiBTYXQsIDkgTWFyIDIwMjQgMDA6Mjc6MjUgKzA1MzAKU3ViamVjdDogW1BBVENI IHYyXSBhdmZpbHRlci9mX3NlbGVjdC5jOiBhZGQgc3VwcG9ydCBmb3IgaXcgYW5kIGloIGNvbnN0 YW50cwoKLS0tCiBkb2MvZmlsdGVycy50ZXhpICAgICAgIHwgIDYgKysrKysrCiBsaWJhdmZpbHRl ci9mX3NlbGVjdC5jIHwgMTQgKysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgMjAgaW5z ZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RvYy9maWx0ZXJzLnRleGkgYi9kb2MvZmlsdGVycy50 ZXhpCmluZGV4IDkxMzM2NTY3MWQuLmU3M2RjOWMxYmYgMTAwNjQ0Ci0tLSBhL2RvYy9maWx0ZXJz LnRleGkKKysrIGIvZG9jL2ZpbHRlcnMudGV4aQpAQCAtMzA3MzcsNiArMzA3MzcsMTIgQEAgbWlz c2luZy4KIFRoYXQgYmFzaWNhbGx5IG1lYW5zIHRoYXQgYW4gaW5wdXQgZnJhbWUgaXMgc2VsZWN0 ZWQgaWYgaXRzIHB0cyBpcyB3aXRoaW4gdGhlCiBpbnRlcnZhbCBzZXQgYnkgdGhlIGNvbmNhdCBk ZW11eGVyLgogCitAaXRlbSBpdyBAZW1waHsodmlkZW8gb25seSl9CitSZXByZXNlbnRzIHRoZSB3 aWR0aCBvZiB0aGUgaW5wdXQgdmlkZW8gZnJhbWUKKworQGl0ZW0gaWggQGVtcGh7KHZpZGVvIG9u bHkpfQorUmVwcmVzZW50cyB0aGUgaGVpZ2h0IG9mIHRoZSBpbnB1dCB2aWRlbyBmcmFtZQorCiBA ZW5kIHRhYmxlCiAKIFRoZSBkZWZhdWx0IHZhbHVlIG9mIHRoZSBzZWxlY3QgZXhwcmVzc2lvbiBp cyAiMSIuCmRpZmYgLS1naXQgYS9saWJhdmZpbHRlci9mX3NlbGVjdC5jIGIvbGliYXZmaWx0ZXIv Zl9zZWxlY3QuYwppbmRleCA5YjMzMGEwNjczLi5jY2ZlOTE1ZWUxIDEwMDY0NAotLS0gYS9saWJh dmZpbHRlci9mX3NlbGVjdC5jCisrKyBiL2xpYmF2ZmlsdGVyL2Zfc2VsZWN0LmMKQEAgLTkwLDYg KzkwLDkgQEAgc3RhdGljIGNvbnN0IGNoYXIgKmNvbnN0IHZhcl9uYW1lc1tdID0gewogCiAgICAg ImNvbmNhdGRlY19zZWxlY3QiLCAgLy8vPCBmcmFtZSBpcyB3aXRoaW4gdGhlIGludGVydmFsIHNl dCBieSB0aGUgY29uY2F0IGRlbXV4ZXIKIAorICAgICJpaCIsICAgICAgICAgICAgICAgIC8vLzwg aWg6IFJlcHJlc2VudHMgdGhlIGhlaWdodCBvZiB0aGUgaW5wdXQgdmlkZW8gZnJhbWUuCisgICAg Iml3IiwgICAgICAgICAgICAgICAgLy8vPCBpdzogUmVwcmVzZW50cyB0aGUgd2lkdGggb2YgdGhl IGlucHV0IHZpZGVvIGZyYW1lLgorCiAgICAgTlVMTAogfTsKIApAQCAtMTQ0LDYgKzE0Nyw5IEBA IGVudW0gdmFyX25hbWUgewogCiAgICAgVkFSX0NPTkNBVERFQ19TRUxFQ1QsCiAKKyAgICBWQVJf SUgsCisgICAgVkFSX0lXLAorCiAgICAgVkFSX1ZBUlNfTkIKIH07CiAKQEAgLTI2NCw2ICsyNzAs OSBAQCBzdGF0aWMgaW50IGNvbmZpZ19pbnB1dChBVkZpbHRlckxpbmsgKmlubGluaykKICAgICBz ZWxlY3QtPnZhcl92YWx1ZXNbVkFSX0NPTlNVTUVEX1NBTVBMRVNfTl0gPSBOQU47CiAgICAgc2Vs ZWN0LT52YXJfdmFsdWVzW1ZBUl9TQU1QTEVTX05dICAgICAgICAgID0gTkFOOwogCisgICAgc2Vs ZWN0LT52YXJfdmFsdWVzW1ZBUl9JSF0gPSBOQU47CisgICAgc2VsZWN0LT52YXJfdmFsdWVzW1ZB Ul9JV10gPSBOQU47CisKICAgICBzZWxlY3QtPnZhcl92YWx1ZXNbVkFSX1NBTVBMRV9SQVRFXSA9 CiAgICAgICAgIGlubGluay0+dHlwZSA9PSBBVk1FRElBX1RZUEVfQVVESU8gPyBpbmxpbmstPnNh bXBsZV9yYXRlIDogTkFOOwogCkBAIC0zNzAsNiArMzc5LDEwIEBAIEZGX0VOQUJMRV9ERVBSRUNB VElPTl9XQVJOSU5HUwogICAgICAgICB9CiAgICAgICAgIGJyZWFrOwogICAgIH0KKyAgICBpZiAo aW5saW5rLT50eXBlID09IEFWTUVESUFfVFlQRV9WSURFTyl7CisgICAgICAgIHNlbGVjdC0+dmFy X3ZhbHVlc1tWQVJfSUhdID0gZnJhbWUtPmhlaWdodDsKKyAgICAgICAgc2VsZWN0LT52YXJfdmFs dWVzW1ZBUl9JV10gPSBmcmFtZS0+d2lkdGg7CisgICAgfQogCiAgICAgc2VsZWN0LT5zZWxlY3Qg PSByZXMgPSBhdl9leHByX2V2YWwoc2VsZWN0LT5leHByLCBzZWxlY3QtPnZhcl92YWx1ZXMsIE5V TEwpOwogICAgIGF2X2xvZyhpbmxpbmstPmRzdCwgQVZfTE9HX0RFQlVHLApAQCAtNTQ2LDMgKzU1 OSw0IEBAIGNvbnN0IEFWRmlsdGVyIGZmX3ZmX3NlbGVjdCA9IHsKICAgICAuZmxhZ3MgICAgICAg ICA9IEFWRklMVEVSX0ZMQUdfRFlOQU1JQ19PVVRQVVRTIHwgQVZGSUxURVJfRkxBR19NRVRBREFU QV9PTkxZLAogfTsKICNlbmRpZiAvKiBDT05GSUdfU0VMRUNUX0ZJTFRFUiAqLworCi0tIAoyLjQz LjAud2luZG93cy4xCgo= --000000000000661ac00613f25a8f 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". --000000000000661ac00613f25a8f--