From patchwork Thu Nov 9 12:19:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 44597 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4fa4:b0:181:818d:5e7f with SMTP id gh36csp445064pzb; Thu, 9 Nov 2023 04:28:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IE/kVysXSTkMLrhBYavos0I8QFny1h+dwcCxcRvt+W2Wl3PiI14Xs1O4V6l3IplL6e4XJJ6 X-Received: by 2002:a17:907:2d27:b0:9c7:fd91:4309 with SMTP id gs39-20020a1709072d2700b009c7fd914309mr4457688ejc.0.1699532890090; Thu, 09 Nov 2023 04:28:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699532890; cv=none; d=google.com; s=arc-20160816; b=qbtdRAEbYaCyNhRWsSqkh3PcTwXeLIeiL3iskntTD3dZJ5PMOn/M6o5JNG+18Tjr/6 aK0fc1/UIoymKjcWzvRYc4Oq4h31XKcMAGBEqDBHqASmihGGwb3/WV0go4bw31dZva7A VWHVO42AATKRzS4cPle0/WILo2VK8sGgsW+D6QHphBnX86WKY9GrcgmR3pCDwjCTMBBB 6qGEcRFv8Ahn5j+xC64rj0kLy5y8sP5zabI1C9PIFUHVs5oNwo14DMhsnsHusXRUZr/t k3+ylBlPNzOdEuwqRNNfk+biuXVtguMj8+izKv9RoCGWQ+0DUzF9jyji3493qolOhRCK cwrQ== 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=S9Dtg3AfyTQBj/2Bz2JwvPJh/lMX6Yurldc8dno7s5I=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=PWN8lU4s55XCKBZfH7IQrAX7qgOGv4a+88vf0OMiXIeanfvTGm3XpefLJwsfBpARNa CI1IyAk94+AR5Z6XM6OOFNgEMCx+6VLcgG4kCAFNBWWGPJoOaEiLiYv6LUOtvVvmESGL dBBiRo7l2CbZOs2+PvtphJs0vNCAgUCSEh+0u2aihEuMgyJhirxobn+wt9LzRNsLlKPP iUVa4osJ+OqJCn3PdOFSuD3JG2YCagKGmmqDkX8m5mBK+oiqzhKyOyzBxQl0DcXQ2VUs dvKrOKuxieJBYahGdJINPgrvG6o1X/EVzKluKNfefImryBHLTKYyKVqne2dME8R+JJKy 6OBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=Ufz1yZgD; 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 be5-20020a1709070a4500b009c569bd1e8asi3193925ejc.668.2023.11.09.04.28.09; Thu, 09 Nov 2023 04:28:10 -0800 (PST) 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=Ufz1yZgD; 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 1249668CC9E; Thu, 9 Nov 2023 14:26:01 +0200 (EET) 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 66B6D68CBE3 for ; Thu, 9 Nov 2023 14:25:42 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 7A5F24BD2E; Thu, 9 Nov 2023 13:25:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1699532741; bh=5t2ivg9cjwNVLfJlGdX7waYvnz1XmMjnPqcyYVdOCt4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ufz1yZgDUfwN/A5XyykSZUJKFzLPbV5Oy9uNBwmbK2msy3IjdQHp2xNHg0Io5HtaZ Sk9blAjWRpqgEawsUdSW3r689zLjwPjQYfI5SJt7WxbLbPvLp805echpSXyPG6XA++ c0jIXV9XiaOnlzrl9h/S13iNlk/pP9AYmzfTvMIQ= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Nov 2023 13:19:54 +0100 Message-ID: <20231109122534.124157-23-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231109122534.124157-1-ffmpeg@haasn.xyz> References: <20231109122534.124157-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 22/25] 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: 8GNQ0sFgjXyt 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 58edc70f46..2a9c5c682e 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..e3205127ff 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) -color_range mpeg -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-%=%)