From patchwork Sun May 5 14:02:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 48537 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:e68f:b0:1af:836d:81b3 with SMTP id mz15csp893341pzb; Sun, 5 May 2024 07:02:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW2RWyJ9g2hRwToGhXcA4pNPAWvhMGfT6uIDGazjM+6EYWK4I7rJEE7nWrWR/+XQ8LzW1eUqxM608bzNWGaVVLu5UtBkiRIXAK/6A== X-Google-Smtp-Source: AGHT+IFVsFDucn8ox887AaeyvAljvoUet2PQ+F+44IPt1dXZnvt6E5KUwoa6mrKY5Q4blJwENSCJ X-Received: by 2002:a19:5e19:0:b0:51e:ee83:bb8b with SMTP id s25-20020a195e19000000b0051eee83bb8bmr4475417lfb.5.1714917774720; Sun, 05 May 2024 07:02:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714917774; cv=none; d=google.com; s=arc-20160816; b=0cVVd7N5dGc6+7KT36dmXQQmBLe2MV+BIrxvx4roqutDN6Zh20jfAPgTg9/ii/9feO cQiLbCx46WsQ4IRgWHuaasnRaZj/tOVQpRYBlLV5K5Z73MheWs6H2rsBkguCxsh1AbNK lBMpjcb4UytbKXLnDw0p26iSiJRo7+XlDJriYPqTusggqt+k/HuPYbNdcl87Ag9sbaIT OwLxL23zmMtKpV7VEVvu9jhTA8IXN4WbSkEgc6zxehW4qn+syc1kNJzity107E7i9KWI 4aj+J01iHBM2NgJFhZnwtVw1mAAAsgl6g+W994p4X/bP1HT/iLWZSHhwq6vgNJsScGX0 Jl2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=QrfSeXOQzNryeTXr/HqOBSwU+OJEeYLcZKpplLHL0HU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=HqgNXAs5Wkpy9Foan8x109lN7GP19M0fJg7gVapUetDdPp9d7oX89xepVhSPqoHstV ZWwN186eMu8/JQkDlRY84mUFkW+Io3zqNc7PmdyRqbQklEFNE1uAYYnq07dLj9BCBNqV MRmgRXI7638UfGeYn3JEBAAWWjKMTKNLERbX/sx7883eMmWwfM8ho04Yg8CBSAfVR+Td Im4fCeMa+QZg5Iba7fktCKOMyOnpvYWEccBzC/moCITFq1G+c1YWX+QcKLYHkp6alX/i NeR7El52jwO9xj/9fuJR2YiP/c6Du1/16iHRsYO/Str8VTEtTDc/2GHak0xBVJ/ezGps w+1g==; 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=SaYLVLGl; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r16-20020a05640251d000b0056c3f718c8fsi3633343edd.340.2024.05.05.07.02.53; Sun, 05 May 2024 07:02:54 -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=SaYLVLGl; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73E8A68D5D1; Sun, 5 May 2024 17:02:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5845F68D530 for ; Sun, 5 May 2024 17:02:43 +0300 (EEST) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1edfc57ac0cso1082475ad.3 for ; Sun, 05 May 2024 07:02:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714917761; x=1715522561; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Sz2D+jB+w0lctyKr8Fb5y6DtWRNC1DCUrueuOkcZuD4=; b=SaYLVLGlf/sNToOR1onAwHwRuLJvgcYJZJJi+xfiNWzik9uymB/sHxhJhwXE/0gURi cTpBwu4Q2jM0ZC7k19/ogIIsq9lnJAMKJvloj4ghfWNj80xd5rT4ic8CUokbkyLaP2gM X9TWveVRWF9H9T8CS6Ubw45gTNk2oEgUQ1zuneysPFyt5Y703olRtzopxkQmVXrzYCzO liXUn4uXDEB3fps1Ru99Kl9Fk35Ut2LicN+pyTAgbY1QRMJzCu2zGou0KoQN1Jvlu788 S7KOjh+U0PGwXIT3p4xjo5vpGYimDk1yA79oHcDt5jkQU9LB1A6VBiLAvwbChp5T7yUB cxhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714917761; x=1715522561; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Sz2D+jB+w0lctyKr8Fb5y6DtWRNC1DCUrueuOkcZuD4=; b=Fk3Rg2DjAmEqKVWIOsJ9zyAa2AzzpEk/l5/XBkPm8j6Eqrmc+UGtiD9lpX7eM16j9T i+K67fuEKFd78UHsuSXPeueYmdhdvhxPybpYR3g9afb2Zi0R2IKjksGtMMLHxEO7aH4l eejlna0Ld3kFb0D1UL5PYTHsVG6iKi8q1W+BON3WlLXj6ciG2D3GU85L8OsgJ4SVRUqP V++l40w4UNaf3xUT1rahc985fA7qMdRqFaRfiPo4IkAnxnCBsU6CrPQAvk+l+wT1/2kV W5pz7kqRMVj+PdgMFjpm0VZnYXHm197Rg8zzZ5IF1TJjsz4ohUYPbgQHAAOqMpZKvWVu mXNg== X-Gm-Message-State: AOJu0YxmCabRWy9Mkj74CELHWdRBlFce6dqS9aRf3FUtOtgcNW81qTWn OfsVQMAl59r0OlXZ+Nxh5UUPgmtbC07YIeXZfPFkMg6NrOabYJHyKJTVZw== X-Received: by 2002:a17:902:f607:b0:1e5:1867:d9fa with SMTP id n7-20020a170902f60700b001e51867d9famr10202230plg.44.1714917760870; Sun, 05 May 2024 07:02:40 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id n20-20020a170902969400b001e434b1c6a6sm6524511plp.58.2024.05.05.07.02.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 May 2024 07:02:40 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 May 2024 11:02:19 -0300 Message-ID: <20240505140219.3508-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_scale: don't expose framesync options in vf_scale2ref 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" X-TUID: qzDyw0Kxf3Tr It doesn't use it. Signed-off-by: James Almer --- libavfilter/vf_scale.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 60d301dcd8..07e9025335 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -1228,7 +1228,7 @@ static const AVOption scale_options[] = { }; static const AVClass scale_class = { - .class_name = "scale(2ref)", + .class_name = "scale", .item_name = av_default_item_name, .option = scale_options, .version = LIBAVUTIL_VERSION_INT, @@ -1268,6 +1268,31 @@ const AVFilter ff_vf_scale = { .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, }; +static const AVClass *scale2ref_child_class_iterate(void **iter) +{ + const AVClass *c = *iter ? NULL : sws_get_class(); + *iter = (void*)(uintptr_t)c; + return c; +} + +static void *scale2ref_child_next(void *obj, void *prev) +{ + ScaleContext *s = obj; + if (!prev) + return s->sws_opts; + return NULL; +} + +static const AVClass scale2ref_class = { + .class_name = "scale(2ref)", + .item_name = av_default_item_name, + .option = scale_options, + .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_FILTER, + .child_class_iterate = scale2ref_child_class_iterate, + .child_next = scale2ref_child_next, +}; + static const AVFilterPad avfilter_vf_scale2ref_inputs[] = { { .name = "default", @@ -1303,7 +1328,7 @@ const AVFilter ff_vf_scale2ref = { .init = init, .uninit = uninit, .priv_size = sizeof(ScaleContext), - .priv_class = &scale_class, + .priv_class = &scale2ref_class, FILTER_INPUTS(avfilter_vf_scale2ref_inputs), FILTER_OUTPUTS(avfilter_vf_scale2ref_outputs), FILTER_QUERY_FUNC(query_formats),