From patchwork Tue Jul 30 12:19:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arkadiusz Hiler X-Patchwork-Id: 50815 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b88e:0:b0:489:2eb3:e4c4 with SMTP id p14csp400544vqn; Tue, 30 Jul 2024 05:19:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU6Az5cNkDfNyhRqWhi+5OSpUXLIqCz/87PIZ/+eMji3Fm7G2XJbuLl7tS/yqaxRlGUoQa6ZMuEmzMnIE/XkLO4yOAcLG8vyD29fQ== X-Google-Smtp-Source: AGHT+IEFIgjPyKjX1hLXUfwaxy0uZBiNBk6RLj58J+mGIj7lfx3u+xdhAy/j7JRzZQGLj2jAO9CV X-Received: by 2002:a05:6512:b06:b0:52c:7fe3:d3e5 with SMTP id 2adb3069b0e04-5309b2e04cbmr8894115e87.50.1722341987479; Tue, 30 Jul 2024 05:19:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722341987; cv=none; d=google.com; s=arc-20160816; b=VixOvem1FDgTV4LETik8gLkGVw076FUIjkTNBFUzSGqRuN9HCfs76n89zZanwNWkiO sEKqXIYfSKiZTiYU72/CdgVwM8VMuT0DOImQCuzcfIGES66i7ZGi4fvWF4St3kv+IJvd mhf5Pit88uanmRY3GUafXaZ8IADrVVr/Nm4bb7Uc+7YZhIpV8S4F/MB1ecbJVk/WMG/Y Oy2dnHzEUZdk00dSgq4lU0+6Hj5LpfyGUjnJjTMk9z3bUU/u2ynmUu7zKuJVK3x2bhvX jTOXnNCYfuJY//P2to/zIaPoUxxMTaDV7HXAXnXka4N+i9UXw0ZGEylCuLoLXAvhc8G9 TqSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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:message-id:date:to:from :dkim-signature:delivered-to; bh=FS9FT8zn3VIjsbS8Z4xN+PkHtNhUYqLSG2K4vLg4a5o=; fh=rL+Zbr+cuAi8HZ+OAbgbGzimC54alK2w5Rh1eQXswrg=; b=KNxnlUiMFyUYBstkoPht4uYoO8j83u3hC/EbaJ7OzGQUrWd3pm2o/GNCkJPAIWRZ4N oHZpIxqcqngHwAjlgMY03NzK+xHENd+6f5LA7n1F0aneEifAEm5lVeIZXSYrPudq03AH vwue0FJ9uJVh/rNqmjop9Dy+8CBGUlAhHdvOEho1yvskNa4esru2VJpotFAGT1ZPCCmJ EbsjbiF+t7utqVWe6HGjbUlcjb3bxfA3v2kIwchECVwnSKq7de8ilmZCS7LvWxiEeHjp GYbs4abYv/kJzVxjVIoHQ2yMNSm4RqIlG8sBpKgOOh5uPCzRuE/WFbiKKdly/MIH0khw ximQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@codeweavers.com header.s=s1 header.b=UWTaM9iP; 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=NONE dis=NONE) header.from=codeweavers.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-a7acac67f6fsi778388566b.644.2024.07.30.05.19.46; Tue, 30 Jul 2024 05:19:47 -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=@codeweavers.com header.s=s1 header.b=UWTaM9iP; 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=NONE dis=NONE) header.from=codeweavers.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A670A68D73B; Tue, 30 Jul 2024 15:19:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.codeweavers.com (mail.codeweavers.com [4.36.192.163]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2DF4F68D056 for ; Tue, 30 Jul 2024 15:19:35 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=codeweavers.com; s=s1; h=Message-ID:Date:Subject:Cc:To:From:Sender; bh=pOAXZV95NheGaS+gTqKaPU75Jja4jbKVrjMfYi1ylS4=; b=UWTaM9iPcW1IW7piRjRUv74c9L UNnK7pxi49nb1V5wlJXT+IuFZzhZzM5KEnFWtTYg4adRxfH9YLNpP3/isxmGUGHKXn4S4AkENTiLC r7yQaojxsGBvJ2vVc7S3k6p8wLJeXqVgLgslAEufdBOi/rAvSbn1Y6kN+pcgvQ9aBGidO2a13rqwv gE8zkK0NUabtSmIznMZll4nXjOb8T51wq1jisF4WFQsKDUYEyKdTEaJ7wYN9G8hYMKwYj0yMiQ0Y8 FuRylRhdCrU+Ho28GZcOjeBTjAlBCX9IE5vfZeckFV+MJugRkZCnZjpHd0P/+Pr4tnv/zbKC3mP8P k+QX825Q==; Received: from cw141ip227.vpn.codeweavers.com ([10.69.141.227] helo=localhost) by mail.codeweavers.com with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sYlpB-0052kF-0n; Tue, 30 Jul 2024 07:19:30 -0500 From: Arkadiusz Hiler To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Jul 2024 15:19:25 +0300 Message-ID: <20240730121925.2610445-1-ahiler@codeweavers.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Revert "lavf/vf_setpts: unset output framerate" 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: anton@khirnov.net Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7BAJUPcO4o2V This reverts commit 43fd3d5df6a19fc768a33e37855aa7f8c7050cf0. Fixes: 43fd3d5df6a1 ("lavf/vf_setpts: unset output framerate") Fixes: #11086 Signed-off-by: Arkadiusz Hiler --- libavfilter/setpts.c | 17 +------ tests/ref/fate/filter-setpts | 89 +++++++++++++++--------------------- 2 files changed, 39 insertions(+), 67 deletions(-) diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c index 60cf2b642e0c..60fb3be0b50a 100644 --- a/libavfilter/setpts.c +++ b/libavfilter/setpts.c @@ -150,13 +150,6 @@ static int config_input(AVFilterLink *inlink) return 0; } -static int config_output_video(AVFilterLink *outlink) -{ - outlink->frame_rate = (AVRational){ 1, 0 }; - - return 0; -} - #define BUF_SIZE 64 static inline char *double2int64str(char *buf, double v) @@ -330,14 +323,6 @@ static const AVFilterPad avfilter_vf_setpts_inputs[] = { }, }; -static const AVFilterPad outputs_video[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_output_video, - }, -}; - const AVFilter ff_vf_setpts = { .name = "setpts", .description = NULL_IF_CONFIG_SMALL("Set PTS for the output video frame."), @@ -351,7 +336,7 @@ const AVFilter ff_vf_setpts = { .priv_class = &setpts_class, FILTER_INPUTS(avfilter_vf_setpts_inputs), - FILTER_OUTPUTS(outputs_video), + FILTER_OUTPUTS(ff_video_default_filterpad), }; #endif /* CONFIG_SETPTS_FILTER */ diff --git a/tests/ref/fate/filter-setpts b/tests/ref/fate/filter-setpts index 08e02038315f..efdcf6a16eef 100644 --- a/tests/ref/fate/filter-setpts +++ b/tests/ref/fate/filter-setpts @@ -1,55 +1,42 @@ -#tb 0: 1/1000 +#tb 0: 1/25 #media_type 0: video #codec_id 0: rawvideo #dimensions 0: 352x288 #sar 0: 0/1 -0, 0, 0, 0, 152064, 0x05b789ef -0, 28, 28, 0, 152064, 0x4bb46551 -0, 57, 57, 0, 152064, 0x9dddf64a -0, 86, 86, 0, 152064, 0x2a8380b0 -0, 115, 115, 0, 152064, 0x4de3b652 -0, 144, 144, 0, 152064, 0xedb5a8e6 -0, 172, 172, 0, 152064, 0xe20f7c23 -0, 201, 201, 0, 152064, 0x5ab58bac -0, 229, 229, 0, 152064, 0x1f1b8026 -0, 258, 258, 0, 152064, 0x91373915 -0, 286, 286, 0, 152064, 0x02344760 -0, 314, 314, 0, 152064, 0x30f5fcd5 -0, 343, 343, 0, 152064, 0xc711ad61 -0, 371, 371, 0, 152064, 0x24eca223 -0, 399, 399, 0, 152064, 0x52a48ddd -0, 427, 427, 0, 152064, 0xa91c0f05 -0, 456, 456, 0, 152064, 0x8e364e18 -0, 484, 484, 0, 152064, 0xb15d38c8 -0, 512, 512, 0, 152064, 0xf25f6acc -0, 541, 541, 0, 152064, 0xf34ddbff -0, 570, 570, 0, 152064, 0xfc7bf570 -0, 598, 598, 0, 152064, 0x9dc72412 -0, 627, 627, 0, 152064, 0x445d1d59 -0, 656, 656, 0, 152064, 0x2f2768ef -0, 685, 685, 0, 152064, 0xce09f9d6 -0, 714, 714, 0, 152064, 0x95579936 -0, 743, 743, 0, 152064, 0x43d796b5 -0, 772, 772, 0, 152064, 0xd780d887 -0, 800, 800, 0, 152064, 0x76d2a455 -0, 829, 829, 0, 152064, 0x6dc3650e -0, 858, 858, 0, 152064, 0x0f9d6aca -0, 887, 887, 0, 152064, 0xe295c51e -0, 915, 915, 0, 152064, 0xd766fc8d -0, 944, 944, 0, 152064, 0xe22f7a30 -0, 972, 972, 0, 152064, 0x7fea4378 -0, 1000, 1000, 0, 152064, 0xfa8d94fb -0, 1029, 1029, 0, 152064, 0x4c9737ab -0, 1057, 1057, 0, 152064, 0xa50d01f8 -0, 1085, 1085, 0, 152064, 0x0b07594c -0, 1113, 1113, 0, 152064, 0x88734edd -0, 1142, 1142, 0, 152064, 0xd2735925 -0, 1170, 1170, 0, 152064, 0xd4e49e08 -0, 1198, 1198, 0, 152064, 0x20cebfa9 -0, 1227, 1227, 0, 152064, 0x575c20ec -0, 1255, 1255, 0, 152064, 0xfd500471 -0, 1284, 1284, 0, 152064, 0x61b47e73 -0, 1313, 1313, 0, 152064, 0x09ef53ff -0, 1341, 1341, 0, 152064, 0x6e88c5c2 -0, 1370, 1370, 0, 152064, 0xbb87b483 -0, 1399, 1399, 0, 152064, 0x4bbad8ea +0, 0, 0, 1, 152064, 0x05b789ef +0, 1, 1, 1, 152064, 0x4bb46551 +0, 2, 2, 1, 152064, 0x9dddf64a +0, 3, 3, 1, 152064, 0x2a8380b0 +0, 4, 4, 1, 152064, 0x4de3b652 +0, 5, 5, 1, 152064, 0xedb5a8e6 +0, 6, 6, 1, 152064, 0x5ab58bac +0, 7, 7, 1, 152064, 0x1f1b8026 +0, 8, 8, 1, 152064, 0x91373915 +0, 9, 9, 1, 152064, 0x30f5fcd5 +0, 10, 10, 1, 152064, 0xc711ad61 +0, 11, 11, 1, 152064, 0x52a48ddd +0, 12, 12, 1, 152064, 0xa91c0f05 +0, 13, 13, 1, 152064, 0x8e364e18 +0, 14, 14, 1, 152064, 0xf25f6acc +0, 15, 15, 1, 152064, 0xf34ddbff +0, 16, 16, 1, 152064, 0x9dc72412 +0, 17, 17, 1, 152064, 0x445d1d59 +0, 18, 18, 1, 152064, 0x2f2768ef +0, 19, 19, 1, 152064, 0x95579936 +0, 20, 20, 1, 152064, 0x43d796b5 +0, 21, 21, 1, 152064, 0x76d2a455 +0, 22, 22, 1, 152064, 0x6dc3650e +0, 23, 23, 1, 152064, 0x0f9d6aca +0, 24, 24, 1, 152064, 0xd766fc8d +0, 25, 25, 1, 152064, 0xe22f7a30 +0, 26, 26, 1, 152064, 0xfa8d94fb +0, 27, 27, 1, 152064, 0x4c9737ab +0, 28, 28, 1, 152064, 0xa50d01f8 +0, 29, 29, 1, 152064, 0x88734edd +0, 30, 30, 1, 152064, 0xd2735925 +0, 31, 31, 1, 152064, 0x20cebfa9 +0, 32, 32, 1, 152064, 0x575c20ec +0, 33, 33, 1, 152064, 0x61b47e73 +0, 34, 34, 1, 152064, 0x09ef53ff +0, 35, 35, 1, 152064, 0x6e88c5c2 +0, 36, 36, 1, 152064, 0x4bbad8ea