From patchwork Thu Jun 29 21:19:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42333 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp2049307pzh; Thu, 29 Jun 2023 14:19:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlFujRRzYCyBeFnuf+ZMsvOTWwGzOGoDYZVfSnQPVrsp9pdOkIfQ9ryNZ9Pweiy7tflkxzBA X-Received: by 2002:a17:906:c354:b0:978:a555:9bde with SMTP id ci20-20020a170906c35400b00978a5559bdemr442235ejb.59.1688073594150; Thu, 29 Jun 2023 14:19:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688073594; cv=none; d=google.com; s=arc-20160816; b=wEooP/0YNngwYOWWJLgK2DiFEXF62VD8swY9k4rsj0RHpPPnG3OhXlJUY4PiI+eBdK h+XLaRNzUc7G7c79WG1WJhCEFZyyefqp1wZMeBZu9/Quy1nGXnyOS4UN+edkblgP+gKV 5fACb0E+VV2js9ydqWpY7iHx64cfONqZgSClPMVdNMNVRSLBC/lizNh2TsdAJQkkqSTN CA2lsFQOg6EqjqxUk6noNFwTFJ+P53iPl6SjeqnPLHck9wKxKM9vi//h1f1ody8658Zb QRE8qWJLlmfAvqrWVFo9ivJ3g1Nd6lswAyxc23hCkFypk9dlTjb9QWnNszh8CvbvkW8E 91wQ== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=e/Jtv1kF1frNcvn1vgeddI0bCHwPbMlGh0RUXaOvdsE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=GQ7t9Aa6FVngUbADYXmhAshdpf4gz6tLTinZwklhTMOGWEH0FrTrb2klh7kR9a6isU rVmQP2uXoRhzT5dosbZH/al0Qc1bLFXSSgU8P9ovtDDK/QsUQdTRJKzhq/ZkdcQxKRf6 K5OyHjvLzGdNUu81XWWva2XG22QQnyNMQjswB+xVa22yobidGkf1nwX6CBhaIFf9Fsyc Yq+u0NhCYTW/BXEYeYbVMG+jY3CG0zjKEBeT4MyEWeguw5wG+m3Kz+n9s6ST4y2krT7Q 0tcNSG9DRx+VRsThzl1CZVlDj2nkm5t6CsnG8fQkNCjmpBXBQxDr6RbSMvZiLbWrDcDa 8GgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=dF8nhg2S; 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 op27-20020a170906bcfb00b00977e10fafd3si6794865ejb.1045.2023.06.29.14.19.53; Thu, 29 Jun 2023 14:19: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=20221208 header.b=dF8nhg2S; 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 7BB1C68C0FC; Fri, 30 Jun 2023 00:19:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f45.google.com (mail-oa1-f45.google.com [209.85.160.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6903E68BF52 for ; Fri, 30 Jun 2023 00:19:42 +0300 (EEST) Received: by mail-oa1-f45.google.com with SMTP id 586e51a60fabf-1a1fa977667so1014648fac.1 for ; Thu, 29 Jun 2023 14:19:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688073580; x=1690665580; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=431xkbIHLFRC1jg1thQkLcsKy09gamwZPN1ezQjTIOs=; b=dF8nhg2SDUIXdNBys/KJWX5Drdi49JCT1vgeOW0lQuYyQrIw7lLqczD3Foc5Tsehsg 3HQb6+84HYUF1CeikcUqr51hPfZx5bvg+4E0XbVR2SysdF9QfBqQS92Aolfhp4gOjmVs QPhVmp0gsNcp1mjEjJvsGzkU77DX/T67I52QGK3kwHv4MjPd32tOiMuju4472HiO/xWc m8KIWGp2beN0zCyGSS6KWIfLBzKrlJweO0pgGkUz7dXWeG2F0j5kB2Jr3MJ7iqt9EhoF B1iGTSI+xaGxCLIVLXFepkZXdlPmfNTUAmsCNnCgMi3zwzZlSw9A0wuvg24Ry6F7fsos KbZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688073580; x=1690665580; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=431xkbIHLFRC1jg1thQkLcsKy09gamwZPN1ezQjTIOs=; b=GvQPdGxrr2wQkL8PyC/57Hf1tiRvcSJxkeCsy9Q7v7j5ip/U8VL975OJ3SN4qn3VSk mB/wGs40Yg82qZIr8bbODgDbJ4iRf1oHq0tojwNqrhQbiG5RPKntbBuJfFuVhcC6DHWu BPa5KV95pyW58VXm8iKPoiJ7O5LXALIEeh/qXFTJbD2g+G5ic9EfcjkPtEOLeHItu/Ox ZdrCCjoYEJPxOWxwBzo6RMZX2+2cNLuIBXKGAIRPxllyVX8RXLXreDH60VolRE19eaZZ B1Fc7gwacoWnbuDyY6vyyMOvVHJqls2v4fchLMqYxbgfX1IlW/rJjLNFm0W7UYV0323I C10g== X-Gm-Message-State: ABy/qLaEgoCWzkgOs6EFvMXMThYm6u6irk9v5YO60ujnr+z/U+8nsD7B Fl52fOAWeOivbqm1yM21GrxXaSVje6A= X-Received: by 2002:a05:6871:c10c:b0:1b0:9d86:8e7a with SMTP id yq12-20020a056871c10c00b001b09d868e7amr1003177oab.3.1688073580172; Thu, 29 Jun 2023 14:19:40 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id eq28-20020a056870a91c00b001a2f7ca6183sm8174166oab.38.2023.06.29.14.19.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jun 2023 14:19:39 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Jun 2023 18:19:16 -0300 Message-ID: <20230629211916.8552-1-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230629205555.7869-1-jamrial@gmail.com> References: <20230629205555.7869-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] fate/cbs: add VVC 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0q9y7MetNP37 Signed-off-by: James Almer --- tests/fate/cbs.mak | 40 ++++++++++++++++++++++ tests/ref/fate/cbs-vvc-AUD_A_3 | 1 + tests/ref/fate/cbs-vvc-BOUNDARY_A_3 | 1 + tests/ref/fate/cbs-vvc-BUMP_A_2 | 1 + tests/ref/fate/cbs-vvc-CROP_B_4 | 1 + tests/ref/fate/cbs-vvc-CodingToolsSets_A_2 | 1 + tests/ref/fate/cbs-vvc-HRD_A_3 | 1 + tests/ref/fate/cbs-vvc-PHSH_B_1 | 1 + tests/ref/fate/cbs-vvc-POC_A_1 | 1 + tests/ref/fate/cbs-vvc-PPS_B_1 | 1 + tests/ref/fate/cbs-vvc-RAP_A_1 | 1 + tests/ref/fate/cbs-vvc-SAO_A_3 | 1 + tests/ref/fate/cbs-vvc-SCALING_A_1 | 1 + tests/ref/fate/cbs-vvc-SLICES_A_3 | 1 + tests/ref/fate/cbs-vvc-SPS_B_1 | 1 + tests/ref/fate/cbs-vvc-STILL_B_1 | 1 + tests/ref/fate/cbs-vvc-SUBPIC_A_3 | 1 + tests/ref/fate/cbs-vvc-TILE_A_2 | 1 + tests/ref/fate/cbs-vvc-VPS_A_3 | 1 + tests/ref/fate/cbs-vvc-WPP_A_3 | 1 + tests/ref/fate/cbs-vvc-WP_A_3 | 1 + tests/ref/fate/cbs-vvc-WRAP_A_4 | 1 + 22 files changed, 61 insertions(+) create mode 100644 tests/ref/fate/cbs-vvc-AUD_A_3 create mode 100644 tests/ref/fate/cbs-vvc-BOUNDARY_A_3 create mode 100644 tests/ref/fate/cbs-vvc-BUMP_A_2 create mode 100644 tests/ref/fate/cbs-vvc-CROP_B_4 create mode 100644 tests/ref/fate/cbs-vvc-CodingToolsSets_A_2 create mode 100644 tests/ref/fate/cbs-vvc-HRD_A_3 create mode 100644 tests/ref/fate/cbs-vvc-PHSH_B_1 create mode 100644 tests/ref/fate/cbs-vvc-POC_A_1 create mode 100644 tests/ref/fate/cbs-vvc-PPS_B_1 create mode 100644 tests/ref/fate/cbs-vvc-RAP_A_1 create mode 100644 tests/ref/fate/cbs-vvc-SAO_A_3 create mode 100644 tests/ref/fate/cbs-vvc-SCALING_A_1 create mode 100644 tests/ref/fate/cbs-vvc-SLICES_A_3 create mode 100644 tests/ref/fate/cbs-vvc-SPS_B_1 create mode 100644 tests/ref/fate/cbs-vvc-STILL_B_1 create mode 100644 tests/ref/fate/cbs-vvc-SUBPIC_A_3 create mode 100644 tests/ref/fate/cbs-vvc-TILE_A_2 create mode 100644 tests/ref/fate/cbs-vvc-VPS_A_3 create mode 100644 tests/ref/fate/cbs-vvc-WPP_A_3 create mode 100644 tests/ref/fate/cbs-vvc-WP_A_3 create mode 100644 tests/ref/fate/cbs-vvc-WRAP_A_4 diff --git a/tests/fate/cbs.mak b/tests/fate/cbs.mak index 0084c3d25c..344515a7fa 100644 --- a/tests/fate/cbs.mak +++ b/tests/fate/cbs.mak @@ -5,6 +5,7 @@ fate-cbs: fate-cbs-av1 fate-cbs-h264 fate-cbs-hevc fate-cbs-mpeg2 fate-cbs-vp9 FATE_CBS_DEPS = $(call ALLYES, $(1)_DEMUXER $(2)_PARSER $(3)_METADATA_BSF $(4)_DECODER $(5)_MUXER) +FATE_CBS_NO_DEC_DEPS = $(call ALLYES, $(1)_DEMUXER $(2)_PARSER $(3)_METADATA_BSF $(4)_MUXER) define FATE_CBS_TEST # (codec, test_name, sample_file, output_format) @@ -12,6 +13,12 @@ FATE_CBS_$(1) += fate-cbs-$(1)-$(2) fate-cbs-$(1)-$(2): CMD = md5 -c:v $(3) -i $(TARGET_SAMPLES)/$(4) -c:v copy -y -bsf:v $(1)_metadata -f $(5) endef +define FATE_CBS_NO_DEC_TEST +# (codec, test_name, sample_file, output_format) +FATE_CBS_$(1) += fate-cbs-$(1)-$(2) +fate-cbs-$(1)-$(2): CMD = md5 -i $(TARGET_SAMPLES)/$(3) -c:v copy -y -bsf:v $(1)_metadata -f $(4) +endef + define FATE_CBS_DISCARD_TEST # (codec, discard_type, sample_file, output_format, dep) FATE_CBS_$(1)_DISCARD += fate-cbs-$(1)-discard-$(2) @@ -163,6 +170,39 @@ FATE_CBS_HEVC-$(call ALLYES, MP4_MUXER, HEVC_PARSER, FILTER_UNITS_BSF, HEVC_MUXE FATE_SAMPLES_AVCONV += $(FATE_CBS_HEVC-yes) fate-cbs-hevc: $(FATE_CBS_HEVC-yes) +# H.266 read/write + +FATE_CBS_VVC_SAMPLES = \ + AUD_A_3.bit \ + BOUNDARY_A_3.bit \ + BUMP_A_2.bit \ + CodingToolsSets_A_2.bit \ + CROP_B_4.bit \ + HRD_A_3.bit \ + PHSH_B_1.bit \ + POC_A_1.bit \ + PPS_B_1.bit \ + RAP_A_1.bit \ + SAO_A_3.bit \ + SCALING_A_1.bit \ + SLICES_A_3.bit \ + SPS_B_1.bit \ + STILL_B_1.bit \ + SUBPIC_A_3.bit \ + TILE_A_2.bit \ + VPS_A_3.bit \ + WP_A_3.bit \ + WPP_A_3.bit \ + WRAP_A_4.bit \ + + +$(foreach N,$(FATE_CBS_VVC_SAMPLES),$(eval $(call FATE_CBS_NO_DEC_TEST,vvc,$(basename $(N)),vvc-conformance/$(N),vvc))) + +FATE_CBS_VVC-$(call FATE_CBS_NO_DEC_DEPS, HEVC, HEVC, HEVC, HEVC) = $(FATE_CBS_vvc) + +FATE_SAMPLES_AVCONV += $(FATE_CBS_VVC-yes) +fate-cbs-vvc: $(FATE_CBS_VVC-yes) + # MPEG-2 read/write FATE_CBS_MPEG2_SAMPLES = \ diff --git a/tests/ref/fate/cbs-vvc-AUD_A_3 b/tests/ref/fate/cbs-vvc-AUD_A_3 new file mode 100644 index 0000000000..91dfc817b7 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-AUD_A_3 @@ -0,0 +1 @@ +5a5bf4ec5e75d38958863ce8aa6c1fad diff --git a/tests/ref/fate/cbs-vvc-BOUNDARY_A_3 b/tests/ref/fate/cbs-vvc-BOUNDARY_A_3 new file mode 100644 index 0000000000..2647e37041 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-BOUNDARY_A_3 @@ -0,0 +1 @@ +3ef48cf6019ee5d7ca4ab8d5cd12bbd5 diff --git a/tests/ref/fate/cbs-vvc-BUMP_A_2 b/tests/ref/fate/cbs-vvc-BUMP_A_2 new file mode 100644 index 0000000000..4f7c69c2b7 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-BUMP_A_2 @@ -0,0 +1 @@ +80cb700aa0c31e693abaad7be56a606b diff --git a/tests/ref/fate/cbs-vvc-CROP_B_4 b/tests/ref/fate/cbs-vvc-CROP_B_4 new file mode 100644 index 0000000000..6b46df0c82 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-CROP_B_4 @@ -0,0 +1 @@ +7d451021118d63bebe613cec1f773cc5 diff --git a/tests/ref/fate/cbs-vvc-CodingToolsSets_A_2 b/tests/ref/fate/cbs-vvc-CodingToolsSets_A_2 new file mode 100644 index 0000000000..a6a787b9de --- /dev/null +++ b/tests/ref/fate/cbs-vvc-CodingToolsSets_A_2 @@ -0,0 +1 @@ +6f0043acadfc70d7ec8d556194169a6e diff --git a/tests/ref/fate/cbs-vvc-HRD_A_3 b/tests/ref/fate/cbs-vvc-HRD_A_3 new file mode 100644 index 0000000000..39e4b906c6 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-HRD_A_3 @@ -0,0 +1 @@ +c0d308912bcdda2b780f3e0a808ff138 diff --git a/tests/ref/fate/cbs-vvc-PHSH_B_1 b/tests/ref/fate/cbs-vvc-PHSH_B_1 new file mode 100644 index 0000000000..437a9eb64f --- /dev/null +++ b/tests/ref/fate/cbs-vvc-PHSH_B_1 @@ -0,0 +1 @@ +724e3af9b9aac47049a58534ada918e6 diff --git a/tests/ref/fate/cbs-vvc-POC_A_1 b/tests/ref/fate/cbs-vvc-POC_A_1 new file mode 100644 index 0000000000..f259307ca6 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-POC_A_1 @@ -0,0 +1 @@ +608f780e20d18f8dde4ca25276a66598 diff --git a/tests/ref/fate/cbs-vvc-PPS_B_1 b/tests/ref/fate/cbs-vvc-PPS_B_1 new file mode 100644 index 0000000000..1981930a04 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-PPS_B_1 @@ -0,0 +1 @@ +de563a85244bf4a7781b98198a5bf409 diff --git a/tests/ref/fate/cbs-vvc-RAP_A_1 b/tests/ref/fate/cbs-vvc-RAP_A_1 new file mode 100644 index 0000000000..22661eed54 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-RAP_A_1 @@ -0,0 +1 @@ +6460f629ca2377bd271bd1fa5787214f diff --git a/tests/ref/fate/cbs-vvc-SAO_A_3 b/tests/ref/fate/cbs-vvc-SAO_A_3 new file mode 100644 index 0000000000..d8b3096dde --- /dev/null +++ b/tests/ref/fate/cbs-vvc-SAO_A_3 @@ -0,0 +1 @@ +44f8666cd7fa1f4f52f0570ad29e7a8b diff --git a/tests/ref/fate/cbs-vvc-SCALING_A_1 b/tests/ref/fate/cbs-vvc-SCALING_A_1 new file mode 100644 index 0000000000..e9c5477ccd --- /dev/null +++ b/tests/ref/fate/cbs-vvc-SCALING_A_1 @@ -0,0 +1 @@ +50b3221ba3dc373189527428ea8a4b38 diff --git a/tests/ref/fate/cbs-vvc-SLICES_A_3 b/tests/ref/fate/cbs-vvc-SLICES_A_3 new file mode 100644 index 0000000000..3ff1441c35 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-SLICES_A_3 @@ -0,0 +1 @@ +0b8bd39775a39c6eaed3e0dfaf837144 diff --git a/tests/ref/fate/cbs-vvc-SPS_B_1 b/tests/ref/fate/cbs-vvc-SPS_B_1 new file mode 100644 index 0000000000..a4ca603037 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-SPS_B_1 @@ -0,0 +1 @@ +cf3e0c51035bde7499f80eac34563762 diff --git a/tests/ref/fate/cbs-vvc-STILL_B_1 b/tests/ref/fate/cbs-vvc-STILL_B_1 new file mode 100644 index 0000000000..34b54b736f --- /dev/null +++ b/tests/ref/fate/cbs-vvc-STILL_B_1 @@ -0,0 +1 @@ +bfa7b1d3ad3b84dac122e8127d579a24 diff --git a/tests/ref/fate/cbs-vvc-SUBPIC_A_3 b/tests/ref/fate/cbs-vvc-SUBPIC_A_3 new file mode 100644 index 0000000000..b3b5123fd8 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-SUBPIC_A_3 @@ -0,0 +1 @@ +70eb8a1074a76e63406036e03dc8734a diff --git a/tests/ref/fate/cbs-vvc-TILE_A_2 b/tests/ref/fate/cbs-vvc-TILE_A_2 new file mode 100644 index 0000000000..c788b028d0 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-TILE_A_2 @@ -0,0 +1 @@ +b9fca953a0b5aed276fb3c0418ada885 diff --git a/tests/ref/fate/cbs-vvc-VPS_A_3 b/tests/ref/fate/cbs-vvc-VPS_A_3 new file mode 100644 index 0000000000..62e95650e2 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-VPS_A_3 @@ -0,0 +1 @@ +40c6750868d27bba165a1553c519cee5 diff --git a/tests/ref/fate/cbs-vvc-WPP_A_3 b/tests/ref/fate/cbs-vvc-WPP_A_3 new file mode 100644 index 0000000000..82631cfdfb --- /dev/null +++ b/tests/ref/fate/cbs-vvc-WPP_A_3 @@ -0,0 +1 @@ +c5e6ba8eb4ef6e991b8528ca2490d350 diff --git a/tests/ref/fate/cbs-vvc-WP_A_3 b/tests/ref/fate/cbs-vvc-WP_A_3 new file mode 100644 index 0000000000..71789587dc --- /dev/null +++ b/tests/ref/fate/cbs-vvc-WP_A_3 @@ -0,0 +1 @@ +05a8ac4844ce65c7a64dfd304f4186a5 diff --git a/tests/ref/fate/cbs-vvc-WRAP_A_4 b/tests/ref/fate/cbs-vvc-WRAP_A_4 new file mode 100644 index 0000000000..708d07e623 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-WRAP_A_4 @@ -0,0 +1 @@ +ba7de3caf1bf4efe77bdb424ba5fc814