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 3A9044A27F for ; Mon, 25 Mar 2024 21:06:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE08F68D46A; Mon, 25 Mar 2024 23:06:33 +0200 (EET) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3318968D383 for ; Mon, 25 Mar 2024 23:06:27 +0200 (EET) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-5d8b519e438so2776037a12.1 for ; Mon, 25 Mar 2024 14:06:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711400785; x=1712005585; darn=ffmpeg.org; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=ayUSnY70IVfJTOCu1aL0YVyp4C2lopf4MuwijLGD2gs=; b=IAKbYDgfE+Ci5q9TaNaXksyWVybc5BWDIhukqu8VXa9xrdXaba0NYmooR33Xrxj4Gf uWVqkSwGVCxkmQchnPmHFumRm5sqObkBylQYGqeVwfEmX6+KQim/TTDlebA5oBQNwbD0 NOCg7J38guryx6g6k9FX2m8e86xZVTkLNsVWoDewhfNj5g9CxgmG5/PkvUJLveG5mFj2 MAZHiTJrkhC9VDoSRiF/e3rMNFZ1Z0uS4bxKPxM1xrG22RqYz/2A4b+iigI5+poc+1Sx zKZ17GJO2horcRisoNtAaXk1meDcYHoIR9cfQq5vSzvwfcAnSwATuG/yBRV+CrpZ+jLz uDEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711400785; x=1712005585; h=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=ayUSnY70IVfJTOCu1aL0YVyp4C2lopf4MuwijLGD2gs=; b=JnJPAGtFMxMXF1VCCwQzFdQ48LPrL5ag7aajNLA7EBYa9OaidNL6/dGMf/8dfyNcoO ZOXQ5A/dL/Gb+lh2Rg2tz5I713oWxX+pL9DRHCjn7H5jt6wpWBvOpaoWIS0/wAv+qg8X JKAOzqK5VwfAFF2PuoZHePyUPrE8htWPyHfv09AMIoOjG21kMZ8EpuAdvcRHOYPmB6Yo 2MhreALJc711/cUCpLpUtNXXVfq2mtIAd8hYBt/ol3Pnhq1Kxf/fEc6Gix3Oj7vwjFdf FKYvZ9ztKCbZw9R4AiBAUqY7p8DIwGTub+p48W7gWm3RTKTIoEnDrHcZXzJqF7jAG8tC kwBw== X-Gm-Message-State: AOJu0Yzn5AhWpI5u1ZQWDRGH6WrRAChHWIo4ZF0/OjdHveA9RVB3aeM7 C0eZEuK9Bd14qKwFa9tlbqfcacLvJcUB7y88jmp64BKfO49z+QHa2I6WTnFTb0i0LDuhEYd7HdO XHxi9X6jnaUvXVTtT0+Smkp/fjn2z5kRgTe5nEg== X-Google-Smtp-Source: AGHT+IFsdpxES5fiYebzEfjTFQVKOqO0gQdRQ1ZJtpg18Z9iXYsu23v1tKNDCVpPwtX696u6dcRHfTyR/FujEv9pr6o= X-Received: by 2002:a17:90a:db91:b0:2a0:3dc3:8a8b with SMTP id h17-20020a17090adb9100b002a03dc38a8bmr5273824pjv.47.1711400784860; Mon, 25 Mar 2024 14:06:24 -0700 (PDT) MIME-Version: 1.0 References: <79a25348-0193-4acb-8844-cd2dfaa73ac6@gmail.com> In-Reply-To: From: Poorva <2003gaikarpoorva@gmail.com> Date: Tue, 26 Mar 2024 02:36:11 +0530 Message-ID: To: FFmpeg development discussions and patches , Thilo Borgmann , Cosmin Stejerean Content-Type: multipart/mixed; boundary="000000000000d9b5170614828bc3" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --000000000000d9b5170614828bc3 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable > > > On Mon, Mar 25, 2024 at 2:04=E2=80=AFAM Marton Balint wrote= : > > > On Sun, 24 Mar 2024, Poorva wrote: > > > From 0874a55ad33bb4df2789cbafc5247c0ae3d97e6a Mon Sep 17 00:00:00 2001 > > From: PoorvaGaikar > > Date: Sat, 9 Mar 2024 00:27:25 +0530 > > Subject: [PATCH v2] avfilter/f_select.c: add support for iw and ih > constants > > You should mention the fixed ticket number in the commit message. > > > > > --- > > doc/filters.texi | 6 ++++++ > > libavfilter/f_select.c | 14 ++++++++++++++ > > 2 files changed, 20 insertions(+) > > > > diff --git a/doc/filters.texi b/doc/filters.texi > > index 913365671d..e73dc9c1bf 100644 > > --- a/doc/filters.texi > > +++ b/doc/filters.texi > > @@ -30737,6 +30737,12 @@ missing. > > That basically means that an input frame is selected if its pts is > within the > > interval set by the concat demuxer. > > > > +@item iw @emph{(video only)} > > +Represents the width of the input video frame > > + > > +@item ih @emph{(video only)} > > +Represents the height of the input video frame > > + > > @end table > > > > The default value of the select expression is "1". > > diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c > > index 9b330a0673..ccfe915ee1 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 > video frame. > > + "iw", ///< iw: Represents the width of the input > video 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 NAN; > > + select->var_values[VAR_IW] =3D NAN; > > + > > select->var_values[VAR_SAMPLE_RATE] =3D > > inlink->type =3D=3D AVMEDIA_TYPE_AUDIO ? inlink->sample_rate := NAN; > > > > @@ -370,6 +379,10 @@ FF_ENABLE_DEPRECATION_WARNINGS > > } > > break; > > } > > + if (inlink->type =3D=3D AVMEDIA_TYPE_VIDEO){ > > + select->var_values[VAR_IH] =3D frame->height; > > + select->var_values[VAR_IW] =3D frame->width; > > + } > > There is a switch(inlink->type) just above this, so you should put these > there to the corresponding case AVMEDIA_TYPE_VIDEO, and not create a new > block. > > > > select->select =3D res =3D av_expr_eval(select->expr, > select->var_values, NULL); > > av_log(inlink->dst, AV_LOG_DEBUG, > > @@ -546,3 +559,4 @@ const AVFilter ff_vf_select =3D { > > .flags =3D AVFILTER_FLAG_DYNAMIC_OUTPUTS | > AVFILTER_FLAG_METADATA_ONLY, > > }; > > #endif /* CONFIG_SELECT_FILTER */ > > + > > This is still an uneeded newline. > Thank you for your feedback on the Git patch I submitted for review. I have rectified the problem by adding the necessary changes . The updated patch file is attached 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". > --000000000000d9b5170614828bc3 Content-Type: application/octet-stream; name="v3-0001-avfilter-f_select.c-add-support-for-iw-and-ih-con.patch" Content-Disposition: attachment; filename="v3-0001-avfilter-f_select.c-add-support-for-iw-and-ih-con.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lu7fn3u20 RnJvbSBmNzFiZTFjN2Q4OTdjNjRiNGNiMzNlMDczOTVlMzM0N2VlOTk4ZTQzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQb29ydmFHYWlrYXIgPHBiZ2Fpa2FyX2IyMUBlbC52anRpLmFj LmluPgpEYXRlOiBTYXQsIDkgTWFyIDIwMjQgMDA6Mjc6MjUgKzA1MzAKU3ViamVjdDogW1BBVENI IHYzXSBhdmZpbHRlci9mX3NlbGVjdC5jOiBhZGQgc3VwcG9ydCBmb3IgaXcgYW5kIGloIGNvbnN0 YW50cwoKRml4ZXMgIzEwNTA5Ci0tLQogZG9jL2ZpbHRlcnMudGV4aSAgICAgICB8ICA2ICsrKysr KwogbGliYXZmaWx0ZXIvZl9zZWxlY3QuYyB8IDE1ICsrKysrKysrKysrKysrLQogMiBmaWxlcyBj aGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZG9j L2ZpbHRlcnMudGV4aSBiL2RvYy9maWx0ZXJzLnRleGkKaW5kZXggMThmMGQxYzVhNy4uZWY5YzNl Y2I1MCAxMDA2NDQKLS0tIGEvZG9jL2ZpbHRlcnMudGV4aQorKysgYi9kb2MvZmlsdGVycy50ZXhp CkBAIC0zMDc0MSw2ICszMDc0MSwxMiBAQCBtaXNzaW5nLgogVGhhdCBiYXNpY2FsbHkgbWVhbnMg dGhhdCBhbiBpbnB1dCBmcmFtZSBpcyBzZWxlY3RlZCBpZiBpdHMgcHRzIGlzIHdpdGhpbiB0aGUK IGludGVydmFsIHNldCBieSB0aGUgY29uY2F0IGRlbXV4ZXIuCiAKK0BpdGVtIGl3IEBlbXBoeyh2 aWRlbyBvbmx5KX0KK1JlcHJlc2VudHMgdGhlIHdpZHRoIG9mIHRoZSBpbnB1dCB2aWRlbyBmcmFt ZQorCitAaXRlbSBpaCBAZW1waHsodmlkZW8gb25seSl9CitSZXByZXNlbnRzIHRoZSBoZWlnaHQg b2YgdGhlIGlucHV0IHZpZGVvIGZyYW1lCisKIEBlbmQgdGFibGUKIAogVGhlIGRlZmF1bHQgdmFs dWUgb2YgdGhlIHNlbGVjdCBleHByZXNzaW9uIGlzICIxIi4KZGlmZiAtLWdpdCBhL2xpYmF2Zmls dGVyL2Zfc2VsZWN0LmMgYi9saWJhdmZpbHRlci9mX3NlbGVjdC5jCmluZGV4IDliMzMwYTA2NzMu LjczZmQzYzlmNGIgMTAwNjQ0Ci0tLSBhL2xpYmF2ZmlsdGVyL2Zfc2VsZWN0LmMKKysrIGIvbGli YXZmaWx0ZXIvZl9zZWxlY3QuYwpAQCAtOTAsNiArOTAsOSBAQCBzdGF0aWMgY29uc3QgY2hhciAq Y29uc3QgdmFyX25hbWVzW10gPSB7CiAKICAgICAiY29uY2F0ZGVjX3NlbGVjdCIsICAvLy88IGZy YW1lIGlzIHdpdGhpbiB0aGUgaW50ZXJ2YWwgc2V0IGJ5IHRoZSBjb25jYXQgZGVtdXhlcgogCisg ICAgImloIiwgICAgICAgICAgICAgICAgLy8vPCBpaDogUmVwcmVzZW50cyB0aGUgaGVpZ2h0IG9m IHRoZSBpbnB1dCB2aWRlbyBmcmFtZS4KKyAgICAiaXciLCAgICAgICAgICAgICAgICAvLy88IGl3 OiBSZXByZXNlbnRzIHRoZSB3aWR0aCBvZiB0aGUgaW5wdXQgdmlkZW8gZnJhbWUuCisKICAgICBO VUxMCiB9OwogCkBAIC0xNDQsNiArMTQ3LDkgQEAgZW51bSB2YXJfbmFtZSB7CiAKICAgICBWQVJf Q09OQ0FUREVDX1NFTEVDVCwKIAorICAgIFZBUl9JSCwKKyAgICBWQVJfSVcsCisKICAgICBWQVJf VkFSU19OQgogfTsKIApAQCAtMjY0LDYgKzI3MCw5IEBAIHN0YXRpYyBpbnQgY29uZmlnX2lucHV0 KEFWRmlsdGVyTGluayAqaW5saW5rKQogICAgIHNlbGVjdC0+dmFyX3ZhbHVlc1tWQVJfQ09OU1VN RURfU0FNUExFU19OXSA9IE5BTjsKICAgICBzZWxlY3QtPnZhcl92YWx1ZXNbVkFSX1NBTVBMRVNf Tl0gICAgICAgICAgPSBOQU47CiAKKyAgICBzZWxlY3QtPnZhcl92YWx1ZXNbVkFSX0lIXSA9IE5B TjsKKyAgICBzZWxlY3QtPnZhcl92YWx1ZXNbVkFSX0lXXSA9IE5BTjsKKwogICAgIHNlbGVjdC0+ dmFyX3ZhbHVlc1tWQVJfU0FNUExFX1JBVEVdID0KICAgICAgICAgaW5saW5rLT50eXBlID09IEFW TUVESUFfVFlQRV9BVURJTyA/IGlubGluay0+c2FtcGxlX3JhdGUgOiBOQU47CiAKQEAgLTM1Nyw2 ICszNjYsOSBAQCBGRl9FTkFCTEVfREVQUkVDQVRJT05fV0FSTklOR1MKICAgICAgICAgYnJlYWs7 CiAKICAgICBjYXNlIEFWTUVESUFfVFlQRV9WSURFTzoKKyAgICAgICAgc2VsZWN0LT52YXJfdmFs dWVzW1ZBUl9JSF0gPSBmcmFtZS0+aGVpZ2h0OworICAgICAgICBzZWxlY3QtPnZhcl92YWx1ZXNb VkFSX0lXXSA9IGZyYW1lLT53aWR0aDsKKwogICAgICAgICBzZWxlY3QtPnZhcl92YWx1ZXNbVkFS X0lOVEVSTEFDRV9UWVBFXSA9CiAgICAgICAgICAgICAhKGZyYW1lLT5mbGFncyAmIEFWX0ZSQU1F X0ZMQUdfSU5URVJMQUNFRCkgPyBJTlRFUkxBQ0VfVFlQRV9QIDoKICAgICAgICAgKGZyYW1lLT5m bGFncyAmIEFWX0ZSQU1FX0ZMQUdfVE9QX0ZJRUxEX0ZJUlNUKSA/IElOVEVSTEFDRV9UWVBFX1Qg OiBJTlRFUkxBQ0VfVFlQRV9COwpAQCAtMzcxLDYgKzM4Myw3IEBAIEZGX0VOQUJMRV9ERVBSRUNB VElPTl9XQVJOSU5HUwogICAgICAgICBicmVhazsKICAgICB9CiAKKwogICAgIHNlbGVjdC0+c2Vs ZWN0ID0gcmVzID0gYXZfZXhwcl9ldmFsKHNlbGVjdC0+ZXhwciwgc2VsZWN0LT52YXJfdmFsdWVz LCBOVUxMKTsKICAgICBhdl9sb2coaW5saW5rLT5kc3QsIEFWX0xPR19ERUJVRywKICAgICAgICAg ICAgIm46JWYgcHRzOiVmIHQ6JWYga2V5OiVkIiwKQEAgLTU0NSw0ICs1NTgsNCBAQCBjb25zdCBB VkZpbHRlciBmZl92Zl9zZWxlY3QgPSB7CiAgICAgRklMVEVSX1FVRVJZX0ZVTkMocXVlcnlfZm9y bWF0cyksCiAgICAgLmZsYWdzICAgICAgICAgPSBBVkZJTFRFUl9GTEFHX0RZTkFNSUNfT1VUUFVU UyB8IEFWRklMVEVSX0ZMQUdfTUVUQURBVEFfT05MWSwKIH07Ci0jZW5kaWYgLyogQ09ORklHX1NF TEVDVF9GSUxURVIgKi8KKyNlbmRpZiAvKiBDT05GSUdfU0VMRUNUX0ZJTFRFUiAqLwpcIE5vIG5l d2xpbmUgYXQgZW5kIG9mIGZpbGUKLS0gCjIuNDMuMC53aW5kb3dzLjEKCg== --000000000000d9b5170614828bc3 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". --000000000000d9b5170614828bc3--