From patchwork Fri Oct 18 12:02:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Strasser X-Patchwork-Id: 35199 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:143:b0:48e:c0f8:d0de with SMTP id h3csp858554vqi; Fri, 18 Oct 2024 05:03:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUacnK4D4JYn1v0wdH3tCWTxebJWkKt+oT5Q/l3o7S07N3MNK1QNgXskhron8eTpvetuKE5DA3X8SPOdlhHq1nI@gmail.com X-Google-Smtp-Source: AGHT+IEMPOfyDBJzuIOS2vXag0cFlwYLkMnewBHanIwvO2OLztXtXiaIDfgWHkrE91hAzqNBJvvG X-Received: by 2002:a05:6512:b19:b0:539:df2f:e115 with SMTP id 2adb3069b0e04-53a1521993cmr1414879e87.23.1729252981485; Fri, 18 Oct 2024 05:03:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729252981; cv=none; d=google.com; s=arc-20240605; b=VDaPAE7RYXGispX5gPcQaeoxoEJUVMj7pmIDBFeT96OHms1i5Mqr2Wr7oiAZ7RWAUq 1cgfhC+NmWeJvKO+4hCvlfLKZF3phrY5LAbY8PWu+mSF5nPVFA7//bxGJtSvPWZjVHFW LUrW+LDPJf7njqe/6lIufTGK44puPoPmeVp4uylIusOr/iQOgFJbPvOd5RnTq10PPk70 QtN1Jv+rxDWxJHSmMmXRokTYPtNFQRJtEyJhvFLXiZiH1GGYE/Znip4GUz74w+7e4pRI Hvn5qJ57Jp6pqhQloWZP2jLvX6wrcO4alN2DOl7AfL8tlJlu9p7KrCXWhwIyelyO8oRE uMAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:ui-outboundreport:content-disposition :mime-version:message-id:to:date:delivered-to; bh=+YKjSLUkszTb9aKzSizgsXqM6PijeXpW3hevWCC0MVo=; fh=12mN4pfzDNzdHyzKFbbDbvwqdgi/dxWu8iEqOdEdeaI=; b=gybOjvbBLsLKJt3vIkcRJUbam3GxRRvPljQ1aFkeIt4IZS+/WLjr+K1B4uO3avbNOF VabI8/nmLbE3ElUE8g0tzBR8LeUo1V5arqllShbmTwHsUNsoOWdLz/VotqlaBS3NFFF/ Y1yO+EPyo8a+6ysVZlUvbg1Oqjt8yeXPc/aeNF/5azD6gW1GO7Y8M7rMEc9NdTVnzPK+ Wys/TxsaCRZZQ2lHuwnHRv8VlL1Vw/S1vD2mYvnQCEBnVblDJF5ZRvocxhMuSy33vJEM gJ9VF0Ta+QIbGJy74aUH3wEasHh4S5mP2DR2IG+LdipkXw9zRLyuFImH3baCWYwiadxf GPow==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 4fb4d7f45d1cf-5ca0b11d82dsi1000199a12.579.2024.10.18.05.03.00; Fri, 18 Oct 2024 05:03:01 -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; 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 B794F68DBEC; Fri, 18 Oct 2024 15:02:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (unknown [212.227.15.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C37568DBEC for ; Fri, 18 Oct 2024 15:02:50 +0300 (EEST) X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from metallschleim.local ([91.4.239.114]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MAOJV-1tCW7W1KWZ-00Fq1t for ; Fri, 18 Oct 2024 14:02:49 +0200 Date: Fri, 18 Oct 2024 14:02:48 +0200 To: ffmpeg-devel@ffmpeg.org Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Provags-ID: V03:K1:0KSW0AYLpJicnnFz97yorfkIp667D+OlNg/ct+g1vxxzI5eCVir EWT0BenbMWI3mTdATckcfug58C5VBYKZedCbIfSrOvU/z0jYBPXxVsmOLc//lGd+xfqYamO AOZAoA10vUaKeImNK7R4d7XiwJvppPjR3T/tnvLPgrSWIyZG2zMgMmg2fgGbCuXG0BybEIQ /GOTdPNdbHko3nifKzIZQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:BGC2gxGUa+o=;ujDjmT3UDosisiSc8cMGpGMU8+a DTGttAKqWjPPmTC/8pAVIr8nbBuziz9Nr6nlFTvvROH8hCIIl2Bq9deFyeKC8MA3KQBKUfOUR RbFzz9NZCV2TYaDo5SqZ6JCf5feIaD93Er8DU1+U4YSkLN5Orlc1srxX5B85ZHGCWFjznkLmN zpO1o1gvXKEg0XE1rbqX6dg+T7Jd2QiIbelU5UX0qJvtSAxZ9fg3j71gWu84gj5s65KZw4XWt qzqCm4IA4vmAtuwnGWG9MHHOBOjixGAhhbKlXwWAsaZewJHk5C+XQBpmWtSgNEgywWyWIGMaw HK+CANbx9H7IT4MKh6FhUw9uVAF8mTEnedgn4SeUU+v+mkbchTkX3JdJZPbDRVnLkdX6uAnRx eMt1j1NSU70BIQoS5V9SvXe2IZhZ4VUO1GiFwUoLlUxgMFLBqUR4Uwk/KEFaRJSlZmUSL4bQH W4Xtii1an+s+Fj2jym5M6+9OTGnqPPbordtjH6mz0OEBN/GjJm0993usjaV5aPxIwovuqTquA LQ7uckK84nBSQOCj07R1Tv48MHYp5sb+uBwHIm2yUrM72TiPm9aysTuAH0+JfhIenSqNPu7cl K3z3WHfpYKPCyhDxDANsnerVZ+a9XAHLJhUC237PI5qrBOQAMSQSW855bjPPqMzvA/RiVYtrS FTUsHlMJskmnRSlkknnG46ttbxtD6J1Xdyw0EeT9YVp9YXnbGbWn8Ggyw0QG1aGanapXAguRs b1CNh6nVJFNzMDsO8/ZipFPbzFq/0LFH/yopkJDdcmJs8h/b2Wa5adirbSRQXdhY5dVQLwVAJ Cf5kAuFPiaq/8I37/1uIi7Tg== Subject: [FFmpeg-devel] [RFC PATCH 0/2] Make fate tests succeed with zlib-ng 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: , X-Patchwork-Original-From: Alexander Strasser via ffmpeg-devel From: Alexander Strasser Reply-To: FFmpeg development discussions and patches Cc: Alexander Strasser Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bEJomSMjI8XP This is as subject notes an RFC. I wanted to send it out quickly. Didn't actually test on zlib systems yet (old and new). So it is not that heavily tested yet and maybe has rough edges I didn't notice. I hope this would help to unbreak zlib-ng systems and not disturb systems with older zlib versions. The strategy is 1. re-apply Ramiro's patch to use compression level 0 2. fix the 2 tests that fail with older zlib with extra ref file The mechanism should only be used when other solutions are not available. The alternative files could be dropped in the future e.g. when no more fate clients fail because of it. Best regards, Alexander Alexander Strasser (2): Reapply "tests/fate: disable compression for zlib-based codecs" fate: Make it possible to have alternative reference files tests/fate-run.sh | 10 ++++++ tests/fate/cover-art.mak | 6 ++-- tests/fate/image.mak | 4 +-- tests/fate/lavf-image.mak | 5 +-- tests/fate/lavf-video.mak | 4 +-- tests/fate/mov.mak | 2 +- tests/fate/vcodec.mak | 4 ++- tests/ref/fate/copy-apng | 4 +-- tests/ref/fate/cover-art-aiff-id3v2-remux | 6 ++-- tests/ref/fate/cover-art-flac-remux | 6 ++-- tests/ref/fate/cover-art-mp3-id3v2-remux | 6 ++-- tests/ref/fate/mov-cover-image | 6 ++-- tests/ref/fate/mov-cover-image.alt | 42 +++++++++++++++++++++++ tests/ref/fate/png-icc | 6 ++-- tests/ref/fate/png-mdcv | 4 +-- tests/ref/fate/png-mdcv.alt | 22 ++++++++++++ tests/ref/lavf/apng | 4 +-- tests/ref/lavf/apng.png | 4 +-- tests/ref/lavf/gray16be.png | 4 +-- tests/ref/lavf/png | 4 +-- tests/ref/lavf/rgb48be.png | 4 +-- tests/ref/seek/vsynth_lena-flashsv | 40 ++++++++++----------- tests/ref/vsynth/vsynth1-flashsv | 4 +-- tests/ref/vsynth/vsynth1-mpng | 4 +-- tests/ref/vsynth/vsynth1-zlib | 4 +-- tests/ref/vsynth/vsynth2-flashsv | 4 +-- tests/ref/vsynth/vsynth2-mpng | 4 +-- tests/ref/vsynth/vsynth2-zlib | 4 +-- tests/ref/vsynth/vsynth3-flashsv | 4 +-- tests/ref/vsynth/vsynth3-mpng | 4 +-- tests/ref/vsynth/vsynth3-zlib | 4 +-- tests/ref/vsynth/vsynth_lena-flashsv | 4 +-- tests/ref/vsynth/vsynth_lena-mpng | 4 +-- tests/ref/vsynth/vsynth_lena-zlib | 4 +-- 34 files changed, 161 insertions(+), 84 deletions(-) create mode 100644 tests/ref/fate/mov-cover-image.alt create mode 100644 tests/ref/fate/png-mdcv.alt