From patchwork Fri Oct 13 14:24:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 44245 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4b15:b0:15d:8365:d4b8 with SMTP id fp21csp1039766pzb; Fri, 13 Oct 2023 07:28:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHdWUbVlf/CJ+GyZc+FwsHccjsLyu4k26RCgVQ4iIqOGDHf83AnfJgJO0W6wPeFAQ8EGSX1 X-Received: by 2002:a17:906:10b:b0:9a9:eef6:434a with SMTP id 11-20020a170906010b00b009a9eef6434amr25482475eje.36.1697207313439; Fri, 13 Oct 2023 07:28:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697207313; cv=none; d=google.com; s=arc-20160816; b=beucXDXdOvROW2LlnEjyWDkqj3qGJ9jUQ1dB6INxtDHIINfxnQ5CerNIEZxV8v7THJ MT99muizUcW4Ai/YsHNn9kleJeD7RV/rSCGb0vupDoiDaeeE54nxe4YliKaL12eARyZf z92XlrQJwk0BkDL+1g5Sn/DVmyBjRm3zPf7KDa+9ctby0FGqbWh3SJBTl59cPIF0Spq5 9mlDryPrR4n1BtZmeyV0D8TrH+2B7F+3sVYGoJRo8QCXhjifm6LzJ7KXKEkllTMAoLyn QIfUtJ7+zVWWmJOCUM+KonZzQ8/SqHWJYWHvWmLVvdQ1wQA71Js0kdKbV00YvkKR0Nrf cCOA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=c0CHhunmH2HvjbLr3FRkKfT9vPStfZp0UhYnfG3C3uU=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=Nj1huO3MnDT3z0ezRqkrgnvDVZoB0PERkZya8n5ZQqVWPwWyJy71YxleITgmTA6sQo r+/sTV5VI0EH+dTY+um2fP9BVA6E8RP5vdt1gY+ALT8cr647kDuKZ8hT53o2Pheth17b SK2K2Nm7REaKHsGdenne/JzyHkoM/PlAqpp1UVjMusl0fIGAkmizkC55xlCOGH2MqaCv tZJtOavqAlmkDyexUsUhV5fBtNOseiBajz4HKdoON/4UyduGZHm8cydrazyrefWXqydT wexJsQ/v/VTifDbeMesv1SVeyCqVm9F5uLH5wOAQkGv+UpqDzMJLb958Rmx8F3fMn+FR Jngg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=ZQ8bwBpV; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l11-20020a170906a40b00b0099e02fe7b8csi8985963ejz.799.2023.10.13.07.28.32; Fri, 13 Oct 2023 07:28:33 -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=@haasn.xyz header.s=mail header.b=ZQ8bwBpV; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 55E4B68C8B6; Fri, 13 Oct 2023 17:27:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9931C68C9B8 for ; Fri, 13 Oct 2023 17:27:15 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 3A4CD4BC2B; Fri, 13 Oct 2023 16:27:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1697207232; bh=LaTLHKXLJDv4+zmh/PkSUAJLfPwt+cr0Axxrj+qiKAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZQ8bwBpVwPtgWmvUW7YOgNzVNKTww+MRXsj1k9czJ8VSVUmdXLNEUs8uPINo0XI4l ql2rVGdqL1t9fvrV4I4UaD9RqSVCeRQSQ+HcgakQ1m5dXpGnHIj7fbbOa2QLVPbjmD D/iyXQZFVtjOyzZzhV3ItPS5K95WFdzNpBMF3mQM= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Oct 2023 16:24:45 +0200 Message-ID: <20231013142706.23971-8-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231013142706.23971-1-ffmpeg@haasn.xyz> References: <20231013142706.23971-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 07/13] tests/fate: force MPEG range for rawvideo tests 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GMmFbNkVuC+u From: Niklas Haas The input file is MPEG range, so we should also encode to MPEG range before comparing against it. This bug was avoided in the past because JPEG range YUV inputs were tagged as YUVJ, which resulted in an automatic conversion to PC range by default. After YUVJ removal, we will need to explicitly specify that we want MPEG range, since rawvideo does not care (or signal) if the output is JPEG or MPEG range. Affects both vsynth and owdenoise. --- tests/fate/filter-video.mak | 2 +- tests/fate/vcodec.mak | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 789ec6414c..3aef652244 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -2,7 +2,7 @@ VIDEO_FILTER = $(call ALLYES, $(1:%=%_FILTER) $(2) FILE_PROTOCOL IMAGE2_DEMUXER PGMYUV_DECODER RAWVIDEO_ENCODER NUT_MUXER MD5_PROTOCOL) FATE_FILTER_SAMPLES-$(call FILTERDEMDECENCMUX, PERMS OWDENOISE TRIM SCALE, SMJPEG, MJPEG, RAWVIDEO, RAWVIDEO, PIPE_PROTOCOL) += fate-filter-owdenoise-sample -fate-filter-owdenoise-sample: CMD = ffmpeg -auto_conversion_filters -idct simple -i $(TARGET_SAMPLES)/smjpeg/scenwin.mjpg -vf "trim=duration=0.5,perms=random,owdenoise=10:20:20:enable=not(between(t\,0.2\,1.2))" -an -f rawvideo - +fate-filter-owdenoise-sample: CMD = ffmpeg -auto_conversion_filters -idct simple -i $(TARGET_SAMPLES)/smjpeg/scenwin.mjpg -vf "trim=duration=0.5,perms=random,owdenoise=10:20:20:enable=not(between(t\,0.2\,1.2))" -an -f rawvideo -color_range mpeg - fate-filter-owdenoise-sample: REF = $(SAMPLES)/filter-reference/owdenoise-scenwin.raw fate-filter-owdenoise-sample: CMP_TARGET = 1 fate-filter-owdenoise-sample: FUZZ = 3539 diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 45ed88da96..f7f474c146 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -6,7 +6,7 @@ fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@))) fate-vsynth%: FMT = avi fate-vsynth%: DEFAULT_SIZE = -s 352x288 fate-vsynth3-%: DEFAULT_SIZE = -s $(FATEW)x$(FATEH) -fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -vsync passthrough $(DECOPTS)" "" "" ${TWOPASS} +fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -color_range mpeg -vsync passthrough $(DECOPTS)" "" "" ${TWOPASS} fate-vsynth%: CMP_UNIT = 1 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%)