From patchwork Wed Jan 24 19:45:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Connor Worley X-Patchwork-Id: 45797 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:120f:b0:199:de12:6fa6 with SMTP id v15csp1501315pzf; Wed, 24 Jan 2024 11:45:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IGec+RATNKAgKhQDyP6gG12RgxHhpL+Qom3PwLlKduBWFHbc5EOfZ87mKP/YSSawceL2gy7 X-Received: by 2002:a05:6512:10cd:b0:510:c20:74a9 with SMTP id k13-20020a05651210cd00b005100c2074a9mr1727046lfg.64.1706125527148; Wed, 24 Jan 2024 11:45:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706125527; cv=none; d=google.com; s=arc-20160816; b=mOMAnBem6sSp6V4v7B6s7M4TWdyKNNUZhWmCZdaPI9RYTp8LfmueeNHyVxGOz3x33z S+c+cngZ1fXb0EeYYowYNewKKZxqZZCWxBdM9rLQRbFLByVMQp1QhWW3vgzSoYLkl2QA gaHxobX6bhDq+0FUcsN54NPS49hvFnfaBaxR+IPZnAVqS3ay5f1Ijlt4z7snnws0KkBq 78ZMOWpimGNtqPYIDo9//V9af0Wkxfq23nrM74jdTPbqjNj/2PDvIiG2t/ayi9jDtlrh Qpe9/hMDcU0LGZ5qLlCmxGbJkTgaOD2H4Owu1hTfaq8tN8wizbt4pRv55rM200UYqhPq k1mA== 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=UOypuZ4bUFq46QVoO1NKPrheQsxbvdNPWiNr0kmN8bw=; fh=4o9WedBEbOrq7GvNs0s+TOKeyzmDZRM3O7oe6ZP6vYM=; b=Nk1HGQeudqUTqhhWm/C4UosNhz9tVPDvqJqu2FblPjySF0ThYqPFzp+iCamFy9OFOp maF3CL2FTj1Xu81RSdt0SowlW2TQI7Fv6csQQXIkmB88w1bIGXV1HzvRal+DsQXmKAbF sFuC5xz0n2XWqf22y3JK+okeDQfHpsgurphBRS4DjPCpQUHWuopd+qtMxjVkzb3w5KiZ 17gUxAQX3XUu/Nfk4D7pwQsTpv++lFoqyK7FIKCMpSwO4dBbsBhhGJG0pUNjwANuygXr 2hiZoHYJIvi9Q13Yq/pHuxf2NVTP4yV4dhB/HsHSIijQZ7BrkeqIt4CWdH8+S+FHiMSH RpDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=Kgrk7vPm; 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 w24-20020a17090633d800b00a2c5aff68fasi178434eja.411.2024.01.24.11.45.26; Wed, 24 Jan 2024 11:45:27 -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=@gmail.com header.s=20230601 header.b=Kgrk7vPm; 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 C118568D114; Wed, 24 Jan 2024 21:45:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC4BB68CB6E for ; Wed, 24 Jan 2024 21:45:17 +0200 (EET) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-6dd80d3d419so1707800b3a.3 for ; Wed, 24 Jan 2024 11:45:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706125515; x=1706730315; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=z+xvlMapiiS+qmTIXpu/f2dePCyYB+/vJOLnAPOy94U=; b=Kgrk7vPmW6iKKMcSMNhxa8X4dMa/obLGuyn2TW9B8+Tm67EauGBCiayATOMtis8sTz enjELvLJl51Y5juphdMCJoi+9iMEpSOqDRWSi8H+/WjCghKWH/IZlbeJ0FKh2wB1x+pp 5cT2fo5Re5NZ5p58aBsVCjmrljHhCQxNIh5aicYapdc8/tQFm+7l4MD0x4nl2LivSqBz gIPzk3CMcPJEUaQXaxN27TKQLG3P0Afyqe5i8rfQ7pHODG4XrUFW1ck3mCu2Ez4cBpUv EnEijvkvJChoxLhFa6uh5hENr3Y6H7rgy76zX4+2CnIsBwwxJcrmMOXnLWOUKCKgB7Vs i2ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706125515; x=1706730315; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=z+xvlMapiiS+qmTIXpu/f2dePCyYB+/vJOLnAPOy94U=; b=Z4LLOwVzaZXq8TgvPI4wnsZ2hVGkjoK9JMdvtLOFfZuOKb/U3nkVOsOHdkicbsOmG5 GxX5qvFgueBRqobutBjxesJP9fWXBUj3bLOWDVxsqw8+q4C3BhnCUNSEcaEemrgldDxm 6g6P/wDMP1K+H76p/79gHRFRIB56dXZ3nGIuyZHhIS4hfMVXAdWvdnYkIwh2Y4t32y3Z qqqAdeEGfvOAJ+S0QcNO2k/asdRYIuzP6k1jdsI4VCHjNgPWg3p7d/tSHwhjtj69FABy gBp/NuQlR3BbmXjHMgIYt4R2desy30JM1iL/FDkU70LhxlyA6OLk0+/OVUmCPH2+I077 nqwg== X-Gm-Message-State: AOJu0YxsC5xakEweNwebHN00Uv5dXV53VDnr2L8jsNk3N9nM9wN+dOIs jWBkwzwIW95y7YwFoBkUpVJgoz8hvgGNO2cCrImkXS1dJmTjNLFD06DZ1WMwMA4= X-Received: by 2002:a05:6a00:1152:b0:6db:7038:fc0f with SMTP id b18-20020a056a00115200b006db7038fc0fmr56314pfm.63.1706125514965; Wed, 24 Jan 2024 11:45:14 -0800 (PST) Received: from localhost ([2607:fb10:7301::1]) by smtp.gmail.com with UTF8SMTPSA id fb30-20020a056a002d9e00b006ddc3794de7sm328548pfb.134.2024.01.24.11.45.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 24 Jan 2024 11:45:14 -0800 (PST) From: Connor Worley To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jan 2024 11:45:05 -0800 Message-Id: <20240124194506.15281-1-connorbworley@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] fate/video: add DXV3 DXT1 encoding test 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: Connor Worley Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3jBu2fCRjSIZ Signed-off-by: Connor Worley --- tests/fate/video.mak | 7 +++++++ tests/ref/fate/dxv3enc-dxt1 | 6 ++++++ 2 files changed, 13 insertions(+) create mode 100644 tests/ref/fate/dxv3enc-dxt1 diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 4e7a77537f..fbc8a1a682 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -155,6 +155,13 @@ fate-dxv3-dxt5: CMD = framecrc -i $(TARGET_SAMPLES)/dxv/dxv3-nqwa.mov FATE_VIDEO-$(call FRAMECRC, MOV, DXV) += $(FATE_DXV) fate-dxv: $(FATE_DXV) +fate-dxv3enc%: FMT = $(word 3, $(subst -, ,$(@))) +fate-dxv3enc%: CMD = framecrc -lavfi testsrc2=duration=1:rate=1:size=1920x1080 -c:v dxv -format $(FMT) + +FATE_DXVENC_FMT = dxt1 +FATE_VIDEO-$(call FILTERFRAMECRC, TESTSRC2, DXV_ENCODER) += $(FATE_DXVENC_FMT:%=fate-dxv3enc-%) +fate-dxvenc: $(FATE_DXVENC_FMT:%=fate-dxv3enc-%) + FATE_VIDEO-$(call FRAMECRC, SEGAFILM, CINEPAK) += fate-film-cvid fate-film-cvid: CMD = framecrc -i $(TARGET_SAMPLES)/film/logo-capcom.cpk -an diff --git a/tests/ref/fate/dxv3enc-dxt1 b/tests/ref/fate/dxv3enc-dxt1 new file mode 100644 index 0000000000..3cfd73397e --- /dev/null +++ b/tests/ref/fate/dxv3enc-dxt1 @@ -0,0 +1,6 @@ +#tb 0: 1/1 +#media_type 0: video +#codec_id 0: dxv +#dimensions 0: 1920x1080 +#sar 0: 1/1 +0, 0, 0, 1, 76767, 0x932ecbfa From patchwork Wed Jan 24 19:45:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Connor Worley X-Patchwork-Id: 45798 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:120f:b0:199:de12:6fa6 with SMTP id v15csp1501411pzf; Wed, 24 Jan 2024 11:45:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IF1xD0uxfydLhOFPVcWhGP6MNeMFz05ImnT6Dd6wb6AZpwVPoro6UO5b7quQI9hk928k/C/ X-Received: by 2002:a17:906:2f16:b0:a2f:beff:49be with SMTP id v22-20020a1709062f1600b00a2fbeff49bemr946695eji.125.1706125536021; Wed, 24 Jan 2024 11:45:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706125536; cv=none; d=google.com; s=arc-20160816; b=ALAeIGN7lKzl4Gn1f51lILFtewwUPCJkVj3DzfXzGWfjRtAdb0EdpoJgK9gN+oPe+a Q0E6DnNnOabrkIcIVtSYw6uu5lucP9e/FEZgZ0zeljnHeX7kWW9jcc0xyGrmxn7G5msb mCbtRpk9OgyTtFBeGrY54kv0Iweq/apeuAsxjel9VN3uDuro9PqL9g8ck2Uu8lkR9xQN PKHVq7yLysiLOuvMg14q22C7qV6LhM0dQjaW8UKCvRQAdPKsOQ104jv1gMpFN3o4Ghyx ul5SrrQRRKx/1rz/7Jof6+s0CMPYGpY3uAFPDeYr9QVppbNT/nlzDp3ZoAwsUqwdAZ7m FKcQ== 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=4Uxe1gxMrpSyYxEQpzuFFnLY4CPf6xkcqgnR9OLBjmU=; fh=4o9WedBEbOrq7GvNs0s+TOKeyzmDZRM3O7oe6ZP6vYM=; b=sp/N63FTj30w9kXT0r2vDZAdSnQAdAi+x7SlQNrv4Qp0nIYxeDmr426KeHmCU70wHc ATfAuEkcMLbPP1bkOLTU0ni7HiEyVKAVelpMsgcbkcc6sVbpbxNwWr4s+RqAS7IyzGxe xd2nXD3YPKE/xdNQdWKG616VX+aTQ0CfbEpiEeivzkQztos7zqbKsdja5L+LH0Ly1HEW deM1nPG4H+8EzDR6YSeAW+0hyo1upjOWe2rRbfSVg4tkTexepQ1e5ScUPoeOoTi7/taQ ueX1GYWIWraZuXlNbU99Fr/kMLWRnREzKP7acwt2kB+hYiNZK7HoHZVWK5umj9SMkydh w1JA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=iCwoN0cS; 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 lo27-20020a170906fa1b00b00a2e94a1e99bsi94401ejb.39.2024.01.24.11.45.35; Wed, 24 Jan 2024 11:45:36 -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=@gmail.com header.s=20230601 header.b=iCwoN0cS; 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 05B5268D124; Wed, 24 Jan 2024 21:45:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0B1E068CD10 for ; Wed, 24 Jan 2024 21:45:23 +0200 (EET) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1d76943baafso22752105ad.2 for ; Wed, 24 Jan 2024 11:45:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706125520; x=1706730320; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Xu2+8t50m1cRPyWopGt/A5OjCqipM0BfC5Z0HTCpvY4=; b=iCwoN0cSjfg4RNI6F1c1tqQ90thNJ1CAD0in+Uoq0iaI6Cb+pdfbwT8JD+D6K2+IJV LUanN8yxZqW7wrtYcT+t7FIr193e7OgIVkxf2YPQUjQxP5yStWsNYzyR1vBgO/NKy3wn NAwVCIU5wUherdLT8aGXxewvb9KPae4g73bo/rZjUzEKO9R6DGqbyuXbiYUCykcyMp9E UhYzX75NPrCbEv5YBLLTjpufLccYm8Xn/NmAWtiLFzysO0xdK6ehYBpOxjxzBqgRfOnF WJb5n8aV+BD6FdutRSD4OS8JIKckYyDiDaw5aQYJn7V9q1FoYytk2bwln/qu3e9nzgnq HjvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706125520; x=1706730320; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Xu2+8t50m1cRPyWopGt/A5OjCqipM0BfC5Z0HTCpvY4=; b=KCfpaZbKYPUYgdrYDqeXmz3LKNpNZPBf8wA12WwW5fRtjGH/pz8vUkDt5pcF6yE3RH gW6ydfPCzJW1igKiVS1JRI217AhxuSCE4GO/y1ZL0g4aYFhwMB88vXP9UMVZBIEe6/n2 LLamej5j08mWsa/WVGdDIfgFa+DooXfkZu7lp2Ze2SYcieVxkn1t1WsypNL41H5LnjQ2 aEgyIIXSzwkK5jbPNSE2a7CX8ofrtif352z46CyaTFXRisv8JW9xul6SBDMUsDjTd3fD 0Xmg/OJpOaeZCruqm07GLRPjgRwceBCrrDffXl9FLjIjNXQodg4pT7nkb/mLfqqiChYh WlmA== X-Gm-Message-State: AOJu0YxFwoF25okOqIkZ8Gx2qjgw9qtoK34ExIWa/BYLYywfSCCVTR6l nH+So+/4mqzBS+JgfMbML/YatF18e+l+bfLHRryICDMsconWzr+Qy0qXrctEDmM= X-Received: by 2002:a17:902:ebc5:b0:1d4:e0dd:1510 with SMTP id p5-20020a170902ebc500b001d4e0dd1510mr1521430plg.48.1706125519947; Wed, 24 Jan 2024 11:45:19 -0800 (PST) Received: from localhost ([192.173.69.1]) by smtp.gmail.com with UTF8SMTPSA id w18-20020a170902d11200b001d766749e9bsm3730613plw.156.2024.01.24.11.45.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 24 Jan 2024 11:45:19 -0800 (PST) From: Connor Worley To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jan 2024 11:45:06 -0800 Message-Id: <20240124194506.15281-2-connorbworley@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240124194506.15281-1-connorbworley@gmail.com> References: <20240124194506.15281-1-connorbworley@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] fate/video: add DXV3 HQ 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: Connor Worley Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: F23+MghyyYJM Adds tests to cover decoding YCoCg DXV3 formats with and without alpha Samples: https://connorworley.com/fate-suite/dxv/dxv3-hqna.mov https://connorworley.com/fate-suite/dxv/dxv3-hqwa.mov Signed-off-by: Connor Worley --- tests/fate/video.mak | 6 ++++++ tests/ref/fate/dxv3-ycg6 | 6 ++++++ tests/ref/fate/dxv3-yg10 | 6 ++++++ 3 files changed, 18 insertions(+) create mode 100644 tests/ref/fate/dxv3-ycg6 create mode 100644 tests/ref/fate/dxv3-yg10 diff --git a/tests/fate/video.mak b/tests/fate/video.mak index fbc8a1a682..8f51a42077 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -152,6 +152,12 @@ fate-dxv3-dxt1: CMD = framecrc -i $(TARGET_SAMPLES)/dxv/dxv3-nqna.mov FATE_DXV += fate-dxv3-dxt5 fate-dxv3-dxt5: CMD = framecrc -i $(TARGET_SAMPLES)/dxv/dxv3-nqwa.mov +FATE_DXV += fate-dxv3-ycg6 +fate-dxv3-ycg6: CMD = framecrc -i $(TARGET_SAMPLES)/dxv/dxv3-hqna.mov + +FATE_DXV += fate-dxv3-yg10 +fate-dxv3-yg10: CMD = framecrc -i $(TARGET_SAMPLES)/dxv/dxv3-hqwa.mov + FATE_VIDEO-$(call FRAMECRC, MOV, DXV) += $(FATE_DXV) fate-dxv: $(FATE_DXV) diff --git a/tests/ref/fate/dxv3-ycg6 b/tests/ref/fate/dxv3-ycg6 new file mode 100644 index 0000000000..63c614fbaf --- /dev/null +++ b/tests/ref/fate/dxv3-ycg6 @@ -0,0 +1,6 @@ +#tb 0: 1/30 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 1920x1080 +#sar 0: 0/1 +0, 0, 0, 1, 3110400, 0x1e979f00 diff --git a/tests/ref/fate/dxv3-yg10 b/tests/ref/fate/dxv3-yg10 new file mode 100644 index 0000000000..30e122e4d5 --- /dev/null +++ b/tests/ref/fate/dxv3-yg10 @@ -0,0 +1,6 @@ +#tb 0: 1/30 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 1920x1080 +#sar 0: 0/1 +0, 0, 0, 1, 5184000, 0xe5f0d3da