From patchwork Fri Oct 18 23:05:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koushik Dutta X-Patchwork-Id: 52400 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:143:b0:48e:c0f8:d0de with SMTP id h3csp1496747vqi; Sat, 19 Oct 2024 05:04:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUq5kI0VgVmhUhzRzrL0e1MNZ5835r5dSbKIrgoKrl8MIlbMn6cbTmXtH7JbHHJnnw9k8NFdBm3rPr5RTgzolwv@gmail.com X-Google-Smtp-Source: AGHT+IHg86oaOGaPiSRJnzyfPOQVEFewqyRsOfHkQmo7+dOSJHYLDnZgdLVhNrCeQ8iCWKoTy/gw X-Received: by 2002:a17:907:97c5:b0:a99:f887:ec1d with SMTP id a640c23a62f3a-a9a69c98c46mr432964866b.49.1729339453897; Sat, 19 Oct 2024 05:04:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729339453; cv=none; d=google.com; s=arc-20240605; b=egD/dmLPgAnDcXhs8l40Ct4ZgChKtKHB3e1O0zyuCHM7tZO9nRUHe9i4XBuKFoBnCB 9kJzMYFoVfyQfYkwOVyjPQ4GI6gUZLvDP3GP/jl2UV029xdTg9WbujHASFYqq2up7wQR etoPrwuyYXD5nvBavv4zuzdsBVqLxCQqvjo1ZNq31XY2eh8qA1SBRdRaOwHHyDvQmNXk sfCLkxQvDhCDFmTwVbIlpsfSOs1ejveE9jbsD9uIioi2bsvjz3PZBe6IPiKITbreUpgt ai59TVjSC2hCRjOprTs3+ObMykj6QWZkKWogtuH+sNR9XrNcPrNycBjgTLMGRgNK8DnS 3xpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=ek8CMrdTByG9YNV9qkUm6XPhpSG6VZOxRdqEjHGFrbU=; fh=vf1rgm8KpEMxcRKiIfYPC5TR7MMWdHSIxg51vjgwMpE=; b=Wc9u/Jh7VA6fs5zWOO2qKz6AySJwG+vmFj4IcsTvUnURRYa9BBpsUOYpghn5XD+wVc IW6/8SJJokNTfYokuzLcIVxXRHMxg4xlzvm+OPAYJpK4j+gIh8VQIJy0HWV2NskcJrr7 QOBRl9it4MdU85s83T7q7X5Y+ciNIP2fIVAX2gGGqEcWjjBhiIY04sfqX2RkZBY3DzfO cuRaJmebVik8pR18FQE6F7j5fKWlkYppuX4LdS/1A4cw43x44sdTfRQs1hQY3+CQBDcb j6EL7V5ag5JfXLgXXcz90pajtjtTHt83ClT+qsKeYsAnNQVQifVWLP8hmYDFt49/YELC BgEA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=XxRxB578; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a9a68c2eb19si273692866b.859.2024.10.19.05.04.13; Sat, 19 Oct 2024 05:04:13 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=XxRxB578; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F196A68DD13; Sat, 19 Oct 2024 02:06:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 23FDD68CFAC for ; Sat, 19 Oct 2024 02:06:19 +0300 (EEST) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-20ca1b6a80aso24730525ad.2 for ; Fri, 18 Oct 2024 16:06:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729292777; x=1729897577; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tLX3NcsYb0A33iCjoZPvS64xhFu6/rQH4+cKWhKhkUo=; b=XxRxB5780YiEqyFtgXnYk0NX0LXOC9a47pUJTJsZwxDWpkO+JI9uTn4nCVVvqSgx1Z Ar78ba4CmIDbkje3HoXNecTk41M7uV9T72RZk2EyW2XbZ76VJXQd7ZUz9ny5s/F3EUwl YouK9rZUZImNIpb483j5uqeo5Vy/iNKjk7jZkkwqvxrhOj4nyrgGzelBYtfTQLeKSq5X jLMLaHQ50GUg3sfmd9lYrJNrpOB31uc5Ki1YgJ03fxkhlzZdMQHwA4Yi4Nq7JwX8L8si ijMGQ4TWMRIe6tR7YOKaRyhY4RScD/q284qLFs5CsRGZZjHVGCaxa8Kas9tbOJdUmq90 lytA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729292777; x=1729897577; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tLX3NcsYb0A33iCjoZPvS64xhFu6/rQH4+cKWhKhkUo=; b=POjRiJilzkuF4cgYgyL/Xg5PtnuW7cPMOT9ueDnXNE/o1e6wrHDk54blwn2heA5tuc afAbFvMuVu1SwSitV6ue9NM303ckqrGzFbUXapRxQ3/mTPJJ9ysenaeGGrCWmurySkwb T3KoBxxnUhjwdlCdiFymoZx5Tq5kwTJHHGXKu+XmhyZre1/CVhL7E/D6O5M+YLBwd2Vh CCrQRzp5n2dsAHiBg4DhPZlLdM5e2nngqnYX64sHToDSCsK6Mc1xsGWeLtVARdC87bwS NR7LUp3HWH6kijCyD/6NZ9KrfWs8sXr/zq/1YdFnDChseeRpSoe0VjYxbgGlmYZwZJEq jTDQ== X-Gm-Message-State: AOJu0Yyt3U0PwktTmDUCR0/4xBYSILZr4KKEAPjpgb86BDWyYIioTMLi KXY6gCx3LPcTh5UxwgjopDceGg7JdGplkT3lzG46VF34mvp/jxMDQ+yDTA== X-Received: by 2002:a17:903:94e:b0:20c:62e1:6361 with SMTP id d9443c01a7336-20e5a8a3e9cmr58954385ad.25.1729292777046; Fri, 18 Oct 2024 16:06:17 -0700 (PDT) Received: from Koushik-MacStudio.tail05204.ts.net ([2001:559:76c:0:493a:a469:ed1d:5e06]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20e5a912dafsm17809655ad.276.2024.10.18.16.06.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 18 Oct 2024 16:06:16 -0700 (PDT) From: Koushik Dutta To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Oct 2024 16:05:52 -0700 Message-Id: <20241018230552.80169-4-koushd@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20241018230552.80169-1-koushd@gmail.com> References: <20241018230552.80169-1-koushd@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] scale_vt implementation for negative width/height sizing 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: Koushik Dutta Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: nyoMajY3zFTA --- libavfilter/vf_scale_vt.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libavfilter/vf_scale_vt.c b/libavfilter/vf_scale_vt.c index 3da46a6cd5..3785b884d9 100644 --- a/libavfilter/vf_scale_vt.c +++ b/libavfilter/vf_scale_vt.c @@ -33,8 +33,6 @@ typedef struct ScaleVtContext { AVClass *class; VTPixelTransferSessionRef transfer; - int output_width; - int output_height; char *w_expr; char *h_expr; @@ -232,15 +230,18 @@ static int scale_vt_config_output(AVFilterLink *outlink) FilterLink *inl = ff_filter_link(inlink); AVHWFramesContext *hw_frame_ctx_in; AVHWFramesContext *hw_frame_ctx_out; + int w, h; err = ff_scale_eval_dimensions(s, s->w_expr, s->h_expr, inlink, outlink, - &s->output_width, - &s->output_height); + &w, + &h); if (err < 0) return err; - outlink->w = s->output_width; - outlink->h = s->output_height; + ff_scale_adjust_dimensions(inlink, &w, &h, 0, 1); + + outlink->w = w; + outlink->h = h; if (inlink->sample_aspect_ratio.num) { AVRational r = {outlink->h * inlink->w, outlink->w * inlink->h};