From patchwork Fri Jan 12 08:26:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 45583 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf2f:b0:199:de12:6fa6 with SMTP id gc47csp2204586pzb; Fri, 12 Jan 2024 00:31:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IEFcdBUWJagONp1s9WEXWRSDObHgvfUTgZUKMt5xKqyqms+hsI8JsV77Vs2hcSCEDNpce6q X-Received: by 2002:a05:6402:698:b0:557:8cb9:909a with SMTP id f24-20020a056402069800b005578cb9909amr423365edy.60.1705048293954; Fri, 12 Jan 2024 00:31:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705048293; cv=none; d=google.com; s=arc-20160816; b=yaWcfpiiyl1zQfr5UtneyavKU31D33WDmccq8Kx6HrrOq8hg2WH+u1yUMjbsJkEgaM Qu7+kEDO4KFdLW0nqq111lKoCdXVjZzD99a2LyiYnoF5yj3Znl0Xxurcw2ssm0lbpLug r6egXFeVuMDPQWA05Edg/ek1qXIGFbtXnrT+1iron/EpdAqSOMJD1AVabJv9nmy2mTBY LvN1czYUs0XDzumZWUvUdYdJcuLg63BkkMoGL/26/Sh7cnHLqwLOtXfzSAsi7zqC4jhI 1dHs3eKf1UmsSPYT79PYKonkGN/LXtRtlTrI3b7ZbY2fsTiSMcDwXtZZuqCHOmx+N1VP eg6w== 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=0xTHRu1ANxJ6vqqBuKDBtA9aNBiOKmtg0NVi3j8Q9tk=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=XZw5KeOSW+4pUiKtyuVmmVeDkzYrher1CMYs5BzQYF/2ZbPphyoUhbL21bdpHn7YP6 EaaeOMBnDSach/qRuAu8sUjCFBPF1nxK/T6yUPjfMN5vkwtxqNWd37O1yg3A7+1Vufak OKBJQrxFk/cdZPtCtlAA0xjB3pfD4W5dPZuR48RZjpGYwvIc9K5Z3nETL1QMP8r1ev2Z MlSn1OQX+X7s+E+616fs8lRLIO0K4PCueUTtEt5Crp3w6t2d9F6dn9iokpJgkbxG+v48 BBhxxmim0S29/cyakLQDpscFvIhiSJLWkBvoZ5XDemlmFleP5Cg5sOlyfowvbHMIv2Lx wT7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=flW6mAgJ; 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 c14-20020a0564021f8e00b005582371376bsi1230735edc.301.2024.01.12.00.31.33; Fri, 12 Jan 2024 00:31:33 -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=flW6mAgJ; 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 7B69168D0AF; Fri, 12 Jan 2024 10:30:13 +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 883ED68D098 for ; Fri, 12 Jan 2024 10:30:02 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 2522B414B5; Fri, 12 Jan 2024 09:30:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1705048202; bh=VFp9DZ48s8UzNGxzM7TPCc4onZB0zpqTybPlX+iCQh4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=flW6mAgJS/nJBPepTFNMkcybZxoq8DOrYa3JBX4m6XPk4qKSHTbMAaIuNmNcEbtv7 QS7Tsbk2ofdty0V9r0F8I/wkLd1ROn+Nwi+y+QQV5n5Yn9q6Wcd3ZfAKNMIpjjsGDh q7AhOHMYygHGazYO6qbGM75oiXeJ5ITj6rxJg4Q8= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Jan 2024 09:26:05 +0100 Message-ID: <20240112082950.41637-9-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240112082950.41637-1-ffmpeg@haasn.xyz> References: <20240112082950.41637-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/11] 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: E4qydGS06GP2 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 c8bd8c2e1f..7e46175a4f 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 abdc481f8a..86ef05855f 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 -fps_mode 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 -fps_mode passthrough $(DECOPTS)" "" "" ${TWOPASS} fate-vsynth%: CMP_UNIT = 1 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%)