From patchwork Fri Oct 18 12:03:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Strasser X-Patchwork-Id: 52387 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:143:b0:48e:c0f8:d0de with SMTP id h3csp858748vqi; Fri, 18 Oct 2024 05:03:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV6BX6HXLRW9/5Y+g4SMjocbeVDT/L66XQz+XVrOtQi9oYiybNt3qHFdqbMmvPptv9uitKd2dY18qHDTh8rBQzQ@gmail.com X-Google-Smtp-Source: AGHT+IFO0yYCawdRsfs658E7YA9STr6ZajRxbwZ2DksD/ua4ImRiErKBApmnveX/YJdfuH+MrSOz X-Received: by 2002:a05:6512:2313:b0:539:9ee4:baab with SMTP id 2adb3069b0e04-53a1546fc69mr1921923e87.30.1729252995948; Fri, 18 Oct 2024 05:03:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729252995; cv=none; d=google.com; s=arc-20240605; b=ic213oHxXNYgBOuDr0jIvPTUpvS5rMmEDMIKAuCa48zgv2MQPGDCALCo8xjheG8Or4 cJ6fqDqDNDHblJ/GBv12QGN4dnDPBFLvnvOe7Ne2LXvwXETHhYv8RltXi8njDctnbO62 Rq/NJKRv2hXJ5K8Kak0VJU7aqmkXA4GDth9BNHHotxU87CJHUa/dehYeGrRIbaS1B7VZ bFOUEYoqhA8bDgmqjyPS19TsMkZK1b11HrC2B4Z2NbNO8t5vRqXYwdaV31nRpxVR2I1N FV//Zw572A28zMN/cUYQ7UFttkBlRCcO8XyXsm3GAlAi78U+m3hQQ8SVkNdlLvz7BEov iluA== 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:in-reply-to :content-disposition:mime-version:references:message-id:to:date :delivered-to; bh=rJVe3JXOv/XlggSU7i+5VUooLNrEBC5FGmKw5ucK5Tw=; fh=12mN4pfzDNzdHyzKFbbDbvwqdgi/dxWu8iEqOdEdeaI=; b=IBdOOLiSsxNLhQR8VGhPJDrkEpo9ijB9vka4/BNOkHtUn1sDzIdy4kVgN8BCXfciPs m2wRujyYsd/Lm1Vob7SV/SyRgid0EISR4mNTWbbfIrOjrTn5IqGoBTyVBRRRcgNW4K2a a8jJHzvM8P3LBbeusdp0fwUXvFH+vG4YZOpR8wqWbTXRouS2c9kiQ06rITL/2LxNQZRV gENPt5qSEN67/Op/AGeF2JGDus8ybZ4XA+g6LlK1D0DCvAzD9z4dAIu9z0uaZ3L4mZhR tgIccZXdNKqyQuYR3HucOL2BEKzx8x1exmNNsMA7I5w0T0hsG0EFvQqrLCyJyq2PrAja VNKA==; 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 a640c23a62f3a-a9a68a94e01si110819566b.208.2024.10.18.05.03.15; Fri, 18 Oct 2024 05:03:15 -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 E7D7568DDB2; Fri, 18 Oct 2024 15:03:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D7CB068DBD9 for ; Fri, 18 Oct 2024 15:03:04 +0300 (EEST) X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from metallschleim.local ([91.4.239.114]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MhU5b-1tWRfw3uNv-00ec1r for ; Fri, 18 Oct 2024 14:03:03 +0200 Date: Fri, 18 Oct 2024 14:03:02 +0200 To: ffmpeg-devel@ffmpeg.org Message-ID: <7fecdeea5ec355ddec13de703fee0953b1bc7e2d.1729252615.git.eclipse7@gmx.net> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Provags-ID: V03:K1:iz5iZz92GOPSbevEKUxrWh2BnwynyN18IN2waz1fk/dz0wbPyuw UmiWowsvTj6WjBCc/AfgsHKSIZQ9TOwaMP1ZCZjA1Lf3AXMS3S7x4y6///uHRFa1uvTczHn iJSPEb24mQioN3cMdXry/KNb++81E1TZjErOp5m9kDTEIvrh9AGplm0gWLFphgVzsRNl+EW rlWwgtQAmQC9yUqW8lGeQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:obKEKZe9yuU=;4Tomj7yJll5L/ErJnBPtCxKPD03 PMnKHf4FfTBviGVoQJMMFLQiWljwT+akjFbHhuPTi10o5RXQnBzmdwMtIOKSdooQdZ2zp3GU7 AbCyagjI34sUxUzPAESwwNmxI/i1OIf0Tw0OUYpUfRAnDpr9tvpBgrCXemkiOn0uyH1ZBLuuV b8GDL2lJwABLYqykUVl6Sh+50OydvBKhBxjAR9GR00JZm/t1Hqm/1a3qPpGi5Y48PLoQEW4wA SCge5AbpC9uLGp5hEvSMk+lBtnaRQZQWzhbY2rN+rW8sAEivrJOhzqnMcOTYAGxDe7MBLtKF7 DjCmb+h4ylhlUi9v95FCfSh5Sb3Iq/wxVaTKROETEmn19k+HSQq8IT4ZmZKqpcInxu6xRDgPB rEDStk+wZxPcTLLz34mcd/dIgGf8fWpmbHAKKOGjFJfWOwpFWFspml/227ji/00613iC5bEE2 zJsTWmdni5XAC85dGUdolEMRZlYC8vbgw//5iP9EstK0n7lK45+CNHMrzJxY3stO/txFpxEHp qu8gNwLO0sF4r0p6E8eUmstHNZW7mn1RcC8YPB7NgZXtSN3yvo/fUCmvY1GKvifTcknLf8sq0 upGRB6HbL2tQNDdHyBa3v4Qgq8u2C5zQ4U5KAHqjG35CctdMOQlfh2y9tV1J0+5F6TPozYxLG vL/w4vDYkKrREXLfhgNyljKK2HWeytOfH/Y1bWWX9MP9J2QwpA/Oues/tFf130dd2SL6czLgC ZmhWIDmdE8fmV3DFk4fGhdW+F21lzkHCGg9ERHfVNjId6VRCqf5m/lL30Plc1vSBhpI8A2gaI WeKfiO+A0HyHVbsMIjLtN7cw== Subject: [FFmpeg-devel] [RFC PATCH 1/2] Reapply "tests/fate: disable compression for zlib-based codecs" 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: TRrNXr/BrwUv The problems that caused the revert will be fixed with the follow-up change right after this commit. This reverts commit e206e72b83a0e512e21694a43af4df2b53f6d045. --- 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/png-icc | 6 ++-- tests/ref/fate/png-mdcv | 4 +-- 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 +-- 31 files changed, 87 insertions(+), 84 deletions(-) -- diff --git a/tests/fate/cover-art.mak b/tests/fate/cover-art.mak index faa2182745..7f8958e33f 100644 --- a/tests/fate/cover-art.mak +++ b/tests/fate/cover-art.mak @@ -37,14 +37,14 @@ FATE_COVER_ART_REMUX-$(call ALLYES, FILE_PROTOCOL FLAC_DEMUXER MJPEG_DECODER \ AIFF_DEMUXER BMP_DECODER PNG_DECODER \ FRAMECRC_MUXER PIPE_PROTOCOL) \ += fate-cover-art-aiff-id3v2-remux -fate-cover-art-aiff-id3v2-remux: CMD = transcode flac $(TARGET_SAMPLES)/cover_art/cover_art.flac aiff "-map 0 -map 0:v -map 0:v -map 0:v -c:a pcm_s16be -c:v:0 copy -filter:v:1 scale -c:v:1 png -filter:v:2 scale -c:v:2 bmp -c:v:3 copy -write_id3v2 1 -metadata:g unknown_key=unknown_value -metadata compilation=foo -metadata:s:v:0 title=first -metadata:s:v:1 title=second -metadata:s:v:1 comment=Illustration -metadata:s:v:2 title=third -metadata:s:v:2 comment=Conductor -metadata:s:v:3 title=fourth -metadata:s:v:3 comment=Composer" "-map 0 -c copy -t 0.1" "-show_entries format_tags:stream_tags:stream_disposition=attached_pic:stream=index,codec_name" +fate-cover-art-aiff-id3v2-remux: CMD = transcode flac $(TARGET_SAMPLES)/cover_art/cover_art.flac aiff "-map 0 -map 0:v -map 0:v -map 0:v -c:a pcm_s16be -c:v:0 copy -filter:v:1 scale -c:v:1 png -compression_level:v:1 0 -filter:v:2 scale -c:v:2 bmp -c:v:3 copy -write_id3v2 1 -metadata:g unknown_key=unknown_value -metadata compilation=foo -metadata:s:v:0 title=first -metadata:s:v:1 title=second -metadata:s:v:1 comment=Illustration -metadata:s:v:2 title=third -metadata:s:v:2 comment=Conductor -metadata:s:v:3 title=fourth -metadata:s:v:3 comment=Composer" "-map 0 -c copy -t 0.1" "-show_entries format_tags:stream_tags:stream_disposition=attached_pic:stream=index,codec_name" FATE_COVER_ART_REMUX-$(call ALLYES, FILE_PROTOCOL MP3_DEMUXER MJPEG_DECODER \ SCALE_FILTER PNG_ENCODER BMP_ENCODER \ MP3_MUXER BMP_DECODER PNG_DECODER \ FRAMECRC_MUXER PIPE_PROTOCOL) \ += fate-cover-art-mp3-id3v2-remux -fate-cover-art-mp3-id3v2-remux: CMD = transcode mp3 $(TARGET_SAMPLES)/exif/embedded_small.mp3 mp3 "-map 0 -map 0:v -map 0:v -c:a copy -filter:v:0 scale -filter:v:2 scale -c:v:0 bmp -c:v:1 copy -c:v:2 png -metadata:s:v:0 comment=Band/Orchestra" "-map 0 -c copy -t 0.1" "-show_entries stream_tags:stream_disposition=attached_pic:stream=index,codec_name" +fate-cover-art-mp3-id3v2-remux: CMD = transcode mp3 $(TARGET_SAMPLES)/exif/embedded_small.mp3 mp3 "-map 0 -map 0:v -map 0:v -c:a copy -filter:v:0 scale -filter:v:2 scale -c:v:0 bmp -c:v:1 copy -c:v:2 png -compression_level:v:2 0 -metadata:s:v:0 comment=Band/Orchestra" "-map 0 -c copy -t 0.1" "-show_entries stream_tags:stream_disposition=attached_pic:stream=index,codec_name" # Also covers muxing and demuxing of nonstandard channel layouts into FLAC # as well as the unorthodox multi_dim_quant option of the FLAC encoder. @@ -55,7 +55,7 @@ FATE_COVER_ART_REMUX-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER OGG_DEMUXER \ FLAC_MUXER FLAC_DEMUXER FLAC_DECODER \ FRAMECRC_MUXER PIPE_PROTOCOL) \ += fate-cover-art-flac-remux -fate-cover-art-flac-remux: CMD = transcode mov $(TARGET_SAMPLES)/lossless-audio/inside.m4a flac "-map 0 -map 1:v -map 1:v -af channelmap=channel_layout=FL+FC,aresample -c:a flac -multi_dim_quant 1 -c:v:0 copy -metadata:s:v:0 comment=Illustration -metadata:s:v:0 title=OpenMusic -filter:v:1 scale -c:v:1 png -metadata:s:v:1 title=landscape -c:v:2 copy -filter:v:3 scale -metadata:s:v:2 title=portrait -c:v:3 bmp -metadata:s:v:3 comment=Conductor -c:v:4 copy -t 0.4" "-map 0 -map 0:a -c:a:0 copy -c:v copy" "-show_entries format_tags:stream_tags:stream_disposition=attached_pic:stream=index,codec_name" "-f ogg -i $(TARGET_SAMPLES)/cover_art/ogg_vorbiscomment_cover.opus" +fate-cover-art-flac-remux: CMD = transcode mov $(TARGET_SAMPLES)/lossless-audio/inside.m4a flac "-map 0 -map 1:v -map 1:v -af channelmap=channel_layout=FL+FC,aresample -c:a flac -multi_dim_quant 1 -c:v:0 copy -metadata:s:v:0 comment=Illustration -metadata:s:v:0 title=OpenMusic -filter:v:1 scale -c:v:1 png -compression_level:v:1 0 -metadata:s:v:1 title=landscape -c:v:2 copy -filter:v:3 scale -metadata:s:v:2 title=portrait -c:v:3 bmp -metadata:s:v:3 comment=Conductor -c:v:4 copy -t 0.4" "-map 0 -map 0:a -c:a:0 copy -c:v copy" "-show_entries format_tags:stream_tags:stream_disposition=attached_pic:stream=index,codec_name" "-f ogg -i $(TARGET_SAMPLES)/cover_art/ogg_vorbiscomment_cover.opus" FCA_TEMP-$(call ALLYES, RAWVIDEO_MUXER FILE_PROTOCOL) = $(FATE_COVER_ART-yes) FATE_COVER_ART = $(FCA_TEMP-yes) diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 042cf6438f..55f57c61c9 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -410,7 +410,7 @@ fate-png-side-data: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_frames \ -i $(TARGET_SAMPLES)/png1/lena-int_rgb24.png FATE_PNG_TRANSCODE-$(call TRANSCODE, PNG, IMAGE2 IMAGE_PNG_PIPE) += fate-png-icc -fate-png-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png image2 "-c png" "" "-show_frames" +fate-png-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png image2 "-c png -compression_level 0" "" "-show_frames" FATE_PNG_PROBE-$(call ALLYES, LCMS2) += fate-png-icc-parse fate-png-icc-parse: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_frames \ @@ -419,7 +419,7 @@ fate-png-icc-parse: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_frames \ FATE_PNG_TRANSCODE-$(call TRANSCODE, PNG HEVC, IMAGE2PIPE HEVC, \ IMAGE_PNG_PIPE_DEMUXER HEVC_PARSER PNG_DECODER SCALE_FILTER) += fate-png-mdcv fate-png-mdcv: CMD = transcode hevc $(TARGET_SAMPLES)/hevc/hdr10_plus_h265_sample.hevc image2pipe \ - "-pix_fmt rgb24 -vf scale -c png" "" \ + "-pix_fmt rgb24 -vf scale -c png -compression_level 0" "" \ "-show_frames -show_entries frame=side_data_list -of flat" FATE_PNG-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG) diff --git a/tests/fate/lavf-image.mak b/tests/fate/lavf-image.mak index 4177e091b3..33ae388792 100644 --- a/tests/fate/lavf-image.mak +++ b/tests/fate/lavf-image.mak @@ -88,8 +88,9 @@ fate-lavf-grayf32le.pfm: CMD = lavf_image "-pix_fmt grayf32le" "-pix_fmt grayf fate-lavf-grayf32be.pfm: CMD = lavf_image "-pix_fmt grayf32be" "-pix_fmt grayf32be" fate-lavf-gbrpf32le.pfm: CMD = lavf_image "-pix_fmt gbrpf32le" "-pix_fmt gbrpf32le" fate-lavf-gbrpf32be.pfm: CMD = lavf_image "-pix_fmt gbrpf32be" "-pix_fmt gbrpf32be" -fate-lavf-gray16be.png: CMD = lavf_image "-pix_fmt gray16be" -fate-lavf-rgb48be.png: CMD = lavf_image "-pix_fmt rgb48be" +fate-lavf-png: CMD = lavf_image "-compression_level 0" +fate-lavf-gray16be.png: CMD = lavf_image "-pix_fmt gray16be -compression_level 0" +fate-lavf-rgb48be.png: CMD = lavf_image "-pix_fmt rgb48be -compression_level 0" fate-lavf-rgba.xwd: CMD = lavf_image "-pix_fmt rgba" fate-lavf-rgb565be.xwd: CMD = lavf_image "-pix_fmt rgb565be" fate-lavf-rgb555be.xwd: CMD = lavf_image "-pix_fmt rgb555be" diff --git a/tests/fate/lavf-video.mak b/tests/fate/lavf-video.mak index da3b114bc8..0c474a8506 100644 --- a/tests/fate/lavf-video.mak +++ b/tests/fate/lavf-video.mak @@ -19,8 +19,8 @@ $(FATE_LAVF_VIDEO): CMD = lavf_video $(FATE_LAVF_VIDEO): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%) $(FATE_LAVF_VIDEO): $(VREF) -fate-lavf-apng: CMD = lavf_video "-pix_fmt rgb24" -fate-lavf-apng.png: CMD = lavf_video "-pix_fmt rgb24" "-frames:v 1 -f apng" +fate-lavf-apng: CMD = lavf_video "-pix_fmt rgb24" "-compression_level 0" +fate-lavf-apng.png: CMD = lavf_video "-pix_fmt rgb24" "-frames:v 1 -f apng -compression_level 0" fate-lavf-gray.fits: CMD = lavf_video "-pix_fmt gray" fate-lavf-gray16be.fits: CMD = lavf_video "-pix_fmt gray16be" fate-lavf-gbrp.fits: CMD = lavf_video "-pix_fmt gbrp" diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index ca13ebfd44..4b2fc95170 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -138,7 +138,7 @@ fate-mov-mp4-chapters: CMD = transcode ogg $(TARGET_SAMPLES)/vorbis/vorbis_chapt FATE_MOV_FFMPEG_FFPROBE_SAMPLES-$(call TRANSCODE, PNG, MP4 MOV, MJPEG_DECODER SCALE_FILTER) \ += fate-mov-cover-image -fate-mov-cover-image: CMD = transcode mov $(TARGET_SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a mp4 "-map 0 -map 0:v -c:a copy -c:v:0 copy -filter:v:1 scale -c:v:1 png" "-map 0 -t 0.1 -c copy" "-show_entries stream_disposition=attached_pic:stream=index,codec_name" +fate-mov-cover-image: CMD = transcode mov $(TARGET_SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a mp4 "-map 0 -map 0:v -c:a copy -c:v:0 copy -filter:v:1 scale -c:v:1 png -compression_level:v:1 0" "-map 0 -t 0.1 -c copy" "-show_entries stream_disposition=attached_pic:stream=index,codec_name" FATE_MOV_FFMPEG_FFPROBE_SAMPLES-$(call TRANSCODE, TTML SUBRIP, MP4 MOV, SRT_DEMUXER TTML_MUXER) += fate-mov-mp4-ttml-stpp fate-mov-mp4-ttml-dfxp fate-mov-mp4-ttml-stpp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000" "-map 0 -c copy" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index a12eb43f22..fbdb11458a 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -190,7 +190,7 @@ fate-vsynth%-ffvhuff422p10left: ENCOPTS = -c:v ffvhuff -pix_fmt yuv422p10le -pr fate-vsynth%-ffvhuff444p16: ENCOPTS = -c:v ffvhuff -pix_fmt yuv444p16le -pred plane FATE_VCODEC_SCALE-$(call ENCDEC, FLASHSV, FLV) += flashsv -fate-vsynth%-flashsv: ENCOPTS = -sws_flags neighbor+full_chroma_int +fate-vsynth%-flashsv: ENCOPTS = -sws_flags neighbor+full_chroma_int -compression_level 0 fate-vsynth%-flashsv: DECOPTS = -sws_flags area fate-vsynth%-flashsv: FMT = flv @@ -347,6 +347,7 @@ FATE_VCODEC_SCALE-$(call ENCDEC, MSRLE, AVI) += msrle fate-vsynth%-msrle: CODEC = msrle FATE_VCODEC_SCALE-$(call ENCDEC, PNG, AVI) += mpng +fate-vsynth%-mpng: ENCOPTS = -compression_level 0 fate-vsynth%-mpng: CODEC = png FATE_VCODEC_SCALE-$(call ENCDEC, MSVIDEO1, AVI) += msvideo1 @@ -486,6 +487,7 @@ FATE_VCODEC-$(call ENCDEC, YUV4, AVI) += yuv4 FATE_VCODEC_SCALE-$(call ENCDEC, Y41P, AVI) += y41p FATE_VCODEC_SCALE-$(call ENCDEC, ZLIB, AVI) += zlib +fate-vsynth%-zlib: ENCOPTS = -compression_level 0 FATE_VCODEC-$(CONFIG_SCALE_FILTER) += $(FATE_VCODEC_SCALE-yes) FATE_VCODEC += $(FATE_VCODEC-yes) diff --git a/tests/ref/fate/copy-apng b/tests/ref/fate/copy-apng index 3057573cee..b42cdd6d50 100644 --- a/tests/ref/fate/copy-apng +++ b/tests/ref/fate/copy-apng @@ -1,5 +1,5 @@ -a4c46fad7716ad094eb3c78b74ca0244 *tests/data/fate/copy-apng.apng -6209864 tests/data/fate/copy-apng.apng +5469a98a76aa53248c8de3ef230c86f5 *tests/data/fate/copy-apng.apng +7642536 tests/data/fate/copy-apng.apng #tb 0: 1/25 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/cover-art-aiff-id3v2-remux b/tests/ref/fate/cover-art-aiff-id3v2-remux index a59ba37c65..d8c3ddae15 100644 --- a/tests/ref/fate/cover-art-aiff-id3v2-remux +++ b/tests/ref/fate/cover-art-aiff-id3v2-remux @@ -1,5 +1,5 @@ -330ad2bf538e91a31752b38024461df1 *tests/data/fate/cover-art-aiff-id3v2-remux.aiff -608914 tests/data/fate/cover-art-aiff-id3v2-remux.aiff +47c59be230d16466ed808baf13ac7f95 *tests/data/fate/cover-art-aiff-id3v2-remux.aiff +793474 tests/data/fate/cover-art-aiff-id3v2-remux.aiff #tb 0: 1/44100 #media_type 0: audio #codec_id 0: pcm_s16be @@ -27,7 +27,7 @@ #sar 4: 1/1 0, 0, 0, 1024, 4096, 0xdac4695d 1, 0, 0, 0, 19650, 0xd5662610 -2, 0, 0, 0, 184497, 0xc33f8d44 +2, 0, 0, 0, 369057, 0x037c9a8d 3, 0, 0, 0, 368254, 0xfa7f4bd8 4, 0, 0, 0, 19650, 0xd5662610 0, 1024, 1024, 1024, 4096, 0xad05c909 diff --git a/tests/ref/fate/cover-art-flac-remux b/tests/ref/fate/cover-art-flac-remux index fa91975881..98c6cf53c4 100644 --- a/tests/ref/fate/cover-art-flac-remux +++ b/tests/ref/fate/cover-art-flac-remux @@ -1,5 +1,5 @@ -6defc5081a59ab12c8a5f9e263b25068 *tests/data/fate/cover-art-flac-remux.flac -1098537 tests/data/fate/cover-art-flac-remux.flac +b73d4fef50fe14161a2ab5e3237dadac *tests/data/fate/cover-art-flac-remux.flac +1184223 tests/data/fate/cover-art-flac-remux.flac #extradata 0: 34, 0x8d830abd #tb 0: 1/44100 #media_type 0: audio @@ -38,7 +38,7 @@ #channel_layout_name 6: 2 channels (FL+FC) 0, 0, 0, 4608, 14, 0x242b036d 1, 0, 0, 0, 66888, 0x1fd72743 -2, 0, 0, 0, 438706, 0x8bcb753b +2, 0, 0, 0, 524392, 0x814b1166 3, 0, 0, 0, 21671, 0x7d1c6030 4, 0, 0, 0, 522758, 0x7a63572f 5, 0, 0, 0, 21671, 0x7d1c6030 diff --git a/tests/ref/fate/cover-art-mp3-id3v2-remux b/tests/ref/fate/cover-art-mp3-id3v2-remux index 52b7e72a56..ac7fd804a6 100644 --- a/tests/ref/fate/cover-art-mp3-id3v2-remux +++ b/tests/ref/fate/cover-art-mp3-id3v2-remux @@ -1,5 +1,5 @@ -94946f0efd5f9bb0061ac1fbff7d731f *tests/data/fate/cover-art-mp3-id3v2-remux.mp3 -399346 tests/data/fate/cover-art-mp3-id3v2-remux.mp3 +2bffb402f81acaddc83e23eedf4bf8b6 *tests/data/fate/cover-art-mp3-id3v2-remux.mp3 +442164 tests/data/fate/cover-art-mp3-id3v2-remux.mp3 #tb 0: 1/14112000 #media_type 0: audio #codec_id 0: mp3 @@ -23,7 +23,7 @@ 0, -353590, -353590, 368640, 417, 0x15848290, S=1, 10 1, 0, 0, 0, 208350, 0x291b44d1 2, 0, 0, 0, 15760, 0x71d5c418 -3, 0, 0, 0, 165671, 0x7c1c8070 +3, 0, 0, 0, 208489, 0x40bc0542 0, 15050, 15050, 368640, 418, 0x46f684a4 0, 383690, 383690, 368640, 418, 0x46f684a4 0, 752330, 752330, 368640, 418, 0x46f684a4 diff --git a/tests/ref/fate/mov-cover-image b/tests/ref/fate/mov-cover-image index 5f65c630ea..8272be9e3b 100644 --- a/tests/ref/fate/mov-cover-image +++ b/tests/ref/fate/mov-cover-image @@ -1,5 +1,5 @@ -54a8870d5d1e6cc4da28ae422aa70898 *tests/data/fate/mov-cover-image.mp4 -1011919 tests/data/fate/mov-cover-image.mp4 +ecc0c7b60d4b00a2f04367c2ecd402c2 *tests/data/fate/mov-cover-image.mp4 +2063262 tests/data/fate/mov-cover-image.mp4 #extradata 0: 2, 0x00340022 #tb 0: 1/44100 #media_type 0: audio @@ -20,7 +20,7 @@ 0, -1088, -1088, 1024, 6, 0x027e00e8, F=0x5 0, -64, -64, 1024, 6, 0x027e00e8 1, 0, 0, 0, 25441, 0xe82503b0 -2, 0, 0, 0, 32657, 0x080255d2 +2, 0, 0, 0, 1084000, 0x70fc8139 0, 960, 960, 1024, 6, 0x027e00e8 0, 1984, 1984, 1024, 6, 0x027e00e8 0, 3008, 3008, 1024, 6, 0x027e00e8 diff --git a/tests/ref/fate/png-icc b/tests/ref/fate/png-icc index 19f8c0a752..282cf72e65 100644 --- a/tests/ref/fate/png-icc +++ b/tests/ref/fate/png-icc @@ -1,5 +1,5 @@ -c460cd06a88ace94d7c76a6309aa8fb8 *tests/data/fate/png-icc.image2 -49441 tests/data/fate/png-icc.image2 +ba2d5d2458aa5f20d1d83b974a2d66e3 *tests/data/fate/png-icc.image2 +52752 tests/data/fate/png-icc.image2 #tb 0: 1/25 #media_type 0: video #codec_id 0: rawvideo @@ -19,7 +19,7 @@ best_effort_timestamp_time=0.000000 duration=1 duration_time=0.040000 pkt_pos=0 -pkt_size=49441 +pkt_size=52752 width=128 height=128 crop_top=0 diff --git a/tests/ref/fate/png-mdcv b/tests/ref/fate/png-mdcv index c524a94ded..13ef912ba7 100644 --- a/tests/ref/fate/png-mdcv +++ b/tests/ref/fate/png-mdcv @@ -1,5 +1,5 @@ -fc68fe6c8c72343b96d2695f6913995b *tests/data/fate/png-mdcv.image2pipe -439248 tests/data/fate/png-mdcv.image2pipe +4001769a41d37d567c4cc0c532e20b54 *tests/data/fate/png-mdcv.image2pipe +2774225 tests/data/fate/png-mdcv.image2pipe #tb 0: 1/25 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/lavf/apng b/tests/ref/lavf/apng index 95f1fbee6f..48778b79dd 100644 --- a/tests/ref/lavf/apng +++ b/tests/ref/lavf/apng @@ -1,3 +1,3 @@ -a4c46fad7716ad094eb3c78b74ca0244 *tests/data/lavf/lavf.apng -6209864 tests/data/lavf/lavf.apng +5469a98a76aa53248c8de3ef230c86f5 *tests/data/lavf/lavf.apng +7642536 tests/data/lavf/lavf.apng tests/data/lavf/lavf.apng CRC=0x87b3c15f diff --git a/tests/ref/lavf/apng.png b/tests/ref/lavf/apng.png index b42f5a8db8..311b1844f8 100644 --- a/tests/ref/lavf/apng.png +++ b/tests/ref/lavf/apng.png @@ -1,3 +1,3 @@ -c5900fdd1b2fc30b985793f5226fd0c4 *tests/data/lavf/lavf.apng.png -248854 tests/data/lavf/lavf.apng.png +ce642ff2f3ff112e1099edb05c1ae6d4 *tests/data/lavf/lavf.apng.png +305438 tests/data/lavf/lavf.apng.png tests/data/lavf/lavf.apng.png CRC=0xd8c7b7a1 diff --git a/tests/ref/lavf/gray16be.png b/tests/ref/lavf/gray16be.png index 4f4ce179d2..2f58c7f2e1 100644 --- a/tests/ref/lavf/gray16be.png +++ b/tests/ref/lavf/gray16be.png @@ -1,3 +1,3 @@ -6cf54c13aa407b77547cf6dfe23ecba3 *tests/data/images/gray16be.png/02.gray16be.png -47365 tests/data/images/gray16be.png/02.gray16be.png +f1a75a3633944a961cb489166decfbd8 *tests/data/images/gray16be.png/02.gray16be.png +203747 tests/data/images/gray16be.png/02.gray16be.png tests/data/images/gray16be.png/%02d.gray16be.png CRC=0x893f10ef diff --git a/tests/ref/lavf/png b/tests/ref/lavf/png index 2385ad1800..29b41a02c0 100644 --- a/tests/ref/lavf/png +++ b/tests/ref/lavf/png @@ -1,3 +1,3 @@ -2af72da4468e61a37c220b25cb28618a *tests/data/images/png/02.png -248633 tests/data/images/png/02.png +07379c0f6d61bcea04049fbc5a703150 *tests/data/images/png/02.png +305438 tests/data/images/png/02.png tests/data/images/png/%02d.png CRC=0x6da01946 diff --git a/tests/ref/lavf/rgb48be.png b/tests/ref/lavf/rgb48be.png index b893401a8f..4e2c77002d 100644 --- a/tests/ref/lavf/rgb48be.png +++ b/tests/ref/lavf/rgb48be.png @@ -1,3 +1,3 @@ -b4e38244c97debe3f528e7d1adb283ef *tests/data/images/rgb48be.png/02.rgb48be.png -511900 tests/data/images/rgb48be.png/02.rgb48be.png +c9714a9161c5db30c3455e429a19d368 *tests/data/images/rgb48be.png/02.rgb48be.png +610499 tests/data/images/rgb48be.png/02.rgb48be.png tests/data/images/rgb48be.png/%02d.rgb48be.png CRC=0x5984c023 diff --git a/tests/ref/seek/vsynth_lena-flashsv b/tests/ref/seek/vsynth_lena-flashsv index 25176ba817..b075884d1f 100644 --- a/tests/ref/seek/vsynth_lena-flashsv +++ b/tests/ref/seek/vsynth_lena-flashsv @@ -1,46 +1,46 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 187 size:240757 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 187 size:304522 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 187 size:240757 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 187 size:304522 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:11605750 size:254053 +ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:14313473 size:304522 ret: 0 st: 0 flags:0 ts: 0.788000 -ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:4820505 size:245503 +ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:6090947 size:304522 ret:-1 st: 0 flags:1 ts:-0.317000 ret:-1 st:-1 flags:0 ts: 2.576668 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:8811899 size:253041 +ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:10963555 size:304522 ret: 0 st: 0 flags:0 ts: 0.365000 -ret: 0 st: 0 flags:1 dts: 0.400000 pts: 0.400000 pos:2387440 size:241101 +ret: 0 st: 0 flags:1 dts: 0.400000 pts: 0.400000 pos:3045567 size:304522 ret:-1 st: 0 flags:1 ts:-0.741000 ret:-1 st:-1 flags:0 ts: 2.153336 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:6302822 size:248927 +ret: 0 st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:7918175 size:304522 ret: 0 st: 0 flags:0 ts:-0.058000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 187 size:240757 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 187 size:304522 ret: 0 st: 0 flags:1 ts: 2.836000 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:12114700 size:254237 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14922549 size:304522 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 1.760000 pts: 1.760000 pos:10843564 size:253913 +ret: 0 st: 0 flags:1 dts: 1.760000 pts: 1.760000 pos:13399859 size:304522 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.600000 pts: 0.600000 pos:3598793 size:243372 +ret: 0 st: 0 flags:1 dts: 0.600000 pts: 0.600000 pos:4568257 size:304522 ret: 0 st: 0 flags:0 ts:-0.482000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 187 size:240757 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 187 size:304522 ret: 0 st: 0 flags:1 ts: 2.413000 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:12114700 size:254237 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14922549 size:304522 ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:8053704 size:252195 +ret: 0 st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:10049941 size:304522 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:1187809 size:238567 +ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:1522877 size:304522 ret: 0 st: 0 flags:0 ts:-0.905000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 187 size:240757 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 187 size:304522 ret: 0 st: 0 flags:1 ts: 1.989000 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:12114700 size:254237 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14922549 size:304522 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos:5559226 size:247341 +ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos:7004561 size:304522 ret:-1 st:-1 flags:1 ts:-0.222493 ret:-1 st: 0 flags:0 ts: 2.672000 ret: 0 st: 0 flags:1 ts: 1.566000 -ret: 0 st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:9572235 size:254219 +ret: 0 st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:11877169 size:304522 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:2870241 size:242377 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:3654643 size:304522 ret:-1 st:-1 flags:1 ts:-0.645825 diff --git a/tests/ref/vsynth/vsynth1-flashsv b/tests/ref/vsynth/vsynth1-flashsv index 05f9e9432d..0c34f325d5 100644 --- a/tests/ref/vsynth/vsynth1-flashsv +++ b/tests/ref/vsynth/vsynth1-flashsv @@ -1,4 +1,4 @@ -61b0825258ac6fe85691bdefd892960d *tests/data/fate/vsynth1-flashsv.flv -14681925 tests/data/fate/vsynth1-flashsv.flv +6ca4bef017baaee30c669f4d9c13dcec *tests/data/fate/vsynth1-flashsv.flv +15227087 tests/data/fate/vsynth1-flashsv.flv 791e1fb999deb2e4156e2286d48c4ed1 *tests/data/fate/vsynth1-flashsv.out.rawvideo stddev: 2.84 PSNR: 39.04 MAXDIFF: 49 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-mpng b/tests/ref/vsynth/vsynth1-mpng index 9b394d7629..d43bfc8c8d 100644 --- a/tests/ref/vsynth/vsynth1-mpng +++ b/tests/ref/vsynth/vsynth1-mpng @@ -1,4 +1,4 @@ -6a27410a07ed1c5556e15b7a7c6a586d *tests/data/fate/vsynth1-mpng.avi -12158280 tests/data/fate/vsynth1-mpng.avi +9d585e54573563eb3e2cd1339f3e0abf *tests/data/fate/vsynth1-mpng.avi +15278752 tests/data/fate/vsynth1-mpng.avi 93695a27c24a61105076ca7b1f010bbd *tests/data/fate/vsynth1-mpng.out.rawvideo stddev: 3.42 PSNR: 37.44 MAXDIFF: 48 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-zlib b/tests/ref/vsynth/vsynth1-zlib index 419c6a6b3a..a0420b8c99 100644 --- a/tests/ref/vsynth/vsynth1-zlib +++ b/tests/ref/vsynth/vsynth1-zlib @@ -1,4 +1,4 @@ -fd44e7bf6322f4be46f4f0dada728849 *tests/data/fate/vsynth1-zlib.avi -12108636 tests/data/fate/vsynth1-zlib.avi +0a3e0e7ffce61ee838981900c0f92852 *tests/data/fate/vsynth1-zlib.avi +15216060 tests/data/fate/vsynth1-zlib.avi 93695a27c24a61105076ca7b1f010bbd *tests/data/fate/vsynth1-zlib.out.rawvideo stddev: 3.42 PSNR: 37.44 MAXDIFF: 48 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-flashsv b/tests/ref/vsynth/vsynth2-flashsv index f659edaab5..ff8e0dc47e 100644 --- a/tests/ref/vsynth/vsynth2-flashsv +++ b/tests/ref/vsynth/vsynth2-flashsv @@ -1,4 +1,4 @@ -a2f145e6e44b51f8fc64ead06a994273 *tests/data/fate/vsynth2-flashsv.flv -11637702 tests/data/fate/vsynth2-flashsv.flv +b38cf0a795d1b73c181d5731b9bb495e *tests/data/fate/vsynth2-flashsv.flv +15227087 tests/data/fate/vsynth2-flashsv.flv 7f0fc12c02e68faddc153e69ddd6841c *tests/data/fate/vsynth2-flashsv.out.rawvideo stddev: 1.20 PSNR: 46.52 MAXDIFF: 20 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-mpng b/tests/ref/vsynth/vsynth2-mpng index e49714a3b0..c0d8478174 100644 --- a/tests/ref/vsynth/vsynth2-mpng +++ b/tests/ref/vsynth/vsynth2-mpng @@ -1,4 +1,4 @@ -481e2d148f411bb61783aa688ec22943 *tests/data/fate/vsynth2-mpng.avi -11816978 tests/data/fate/vsynth2-mpng.avi +29aa17dadeac876e281457f031f04bf6 *tests/data/fate/vsynth2-mpng.avi +15278752 tests/data/fate/vsynth2-mpng.avi 32fae3e665407bb4317b3f90fedb903c *tests/data/fate/vsynth2-mpng.out.rawvideo stddev: 1.54 PSNR: 44.37 MAXDIFF: 17 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-zlib b/tests/ref/vsynth/vsynth2-zlib index 9dfb0d679e..aaa511cd80 100644 --- a/tests/ref/vsynth/vsynth2-zlib +++ b/tests/ref/vsynth/vsynth2-zlib @@ -1,4 +1,4 @@ -8d2783483b354e7836cfc45a7241c4eb *tests/data/fate/vsynth2-zlib.avi -11760520 tests/data/fate/vsynth2-zlib.avi +6fbbc0e44d176e8294c79cb34c8aa374 *tests/data/fate/vsynth2-zlib.avi +15216060 tests/data/fate/vsynth2-zlib.avi 32fae3e665407bb4317b3f90fedb903c *tests/data/fate/vsynth2-zlib.out.rawvideo stddev: 1.54 PSNR: 44.37 MAXDIFF: 17 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth3-flashsv b/tests/ref/vsynth/vsynth3-flashsv index cdf9e7bf99..24b7e05981 100644 --- a/tests/ref/vsynth/vsynth3-flashsv +++ b/tests/ref/vsynth/vsynth3-flashsv @@ -1,4 +1,4 @@ -a05a9ab0ae21925dd10a83639de77d77 *tests/data/fate/vsynth3-flashsv.flv -171419 tests/data/fate/vsynth3-flashsv.flv +b68fc961f881a3e02fbdc23a8d69d545 *tests/data/fate/vsynth3-flashsv.flv +175237 tests/data/fate/vsynth3-flashsv.flv faa660b0ecaaab1bf9b5d7284019aa01 *tests/data/fate/vsynth3-flashsv.out.rawvideo stddev: 2.97 PSNR: 38.67 MAXDIFF: 49 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-mpng b/tests/ref/vsynth/vsynth3-mpng index e708a60d98..69ad97729e 100644 --- a/tests/ref/vsynth/vsynth3-mpng +++ b/tests/ref/vsynth/vsynth3-mpng @@ -1,4 +1,4 @@ -3f64b66a1f46e31d45dd7f5514422ed0 *tests/data/fate/vsynth3-mpng.avi -179804 tests/data/fate/vsynth3-mpng.avi +28313b83a75b9847ffacd8427aa4664f *tests/data/fate/vsynth3-mpng.avi +186452 tests/data/fate/vsynth3-mpng.avi 693aff10c094f8bd31693f74cf79d2b2 *tests/data/fate/vsynth3-mpng.out.rawvideo stddev: 3.67 PSNR: 36.82 MAXDIFF: 43 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-zlib b/tests/ref/vsynth/vsynth3-zlib index 55d65f30e0..a052ec4a5f 100644 --- a/tests/ref/vsynth/vsynth3-zlib +++ b/tests/ref/vsynth/vsynth3-zlib @@ -1,4 +1,4 @@ -d3705acfc90b16968d0d4a3ac56b049c *tests/data/fate/vsynth3-zlib.avi -174882 tests/data/fate/vsynth3-zlib.avi +8f5a1eb26fcb1a759fd5ac9fc7f5190c *tests/data/fate/vsynth3-zlib.avi +180860 tests/data/fate/vsynth3-zlib.avi 693aff10c094f8bd31693f74cf79d2b2 *tests/data/fate/vsynth3-zlib.out.rawvideo stddev: 3.67 PSNR: 36.82 MAXDIFF: 43 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth_lena-flashsv b/tests/ref/vsynth/vsynth_lena-flashsv index 7dfec3edf5..81fd183de6 100644 --- a/tests/ref/vsynth/vsynth_lena-flashsv +++ b/tests/ref/vsynth/vsynth_lena-flashsv @@ -1,4 +1,4 @@ -59cdcf5f92c5113e27b2fda632ccd55c *tests/data/fate/vsynth_lena-flashsv.flv -12368953 tests/data/fate/vsynth_lena-flashsv.flv +e3630db004ffa62c3965a83d0f12acbf *tests/data/fate/vsynth_lena-flashsv.flv +15227087 tests/data/fate/vsynth_lena-flashsv.flv 3a984506f1ebfc9fb73b6814cab201cc *tests/data/fate/vsynth_lena-flashsv.out.rawvideo stddev: 0.66 PSNR: 51.73 MAXDIFF: 14 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-mpng b/tests/ref/vsynth/vsynth_lena-mpng index 20258433b0..4a92b99014 100644 --- a/tests/ref/vsynth/vsynth_lena-mpng +++ b/tests/ref/vsynth/vsynth_lena-mpng @@ -1,4 +1,4 @@ -319ca02f8465a9c53128442f4b0dd528 *tests/data/fate/vsynth_lena-mpng.avi -12558334 tests/data/fate/vsynth_lena-mpng.avi +8a728d2ddfa7d6426caaaa0b86e98936 *tests/data/fate/vsynth_lena-mpng.avi +15278752 tests/data/fate/vsynth_lena-mpng.avi 98d0e2854731472c5bf13d8638502d0a *tests/data/fate/vsynth_lena-mpng.out.rawvideo stddev: 1.26 PSNR: 46.10 MAXDIFF: 13 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-zlib b/tests/ref/vsynth/vsynth_lena-zlib index 009bcad853..0bacfc431c 100644 --- a/tests/ref/vsynth/vsynth_lena-zlib +++ b/tests/ref/vsynth/vsynth_lena-zlib @@ -1,4 +1,4 @@ -abbfccc551b173a357024d8392de21dd *tests/data/fate/vsynth_lena-zlib.avi -12517180 tests/data/fate/vsynth_lena-zlib.avi +49dedbffa07ac95e75119feb8d4717e4 *tests/data/fate/vsynth_lena-zlib.avi +15216060 tests/data/fate/vsynth_lena-zlib.avi 98d0e2854731472c5bf13d8638502d0a *tests/data/fate/vsynth_lena-zlib.out.rawvideo stddev: 1.26 PSNR: 46.10 MAXDIFF: 13 bytes: 7603200/ 7603200 From patchwork Fri Oct 18 12:03:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Strasser X-Patchwork-Id: 52388 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:143:b0:48e:c0f8:d0de with SMTP id h3csp858967vqi; Fri, 18 Oct 2024 05:03:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWUeY8UItH0Sh0qal9MpnVUCXA4Td2NQxgrd3tOsnp7Dn7072/tnhiwHdK92u8sLgyqI3SqfWHVAFoTRP2Sil9T@gmail.com X-Google-Smtp-Source: AGHT+IHwTb5NxzgaNGDkuvToa9eey3B3fbW1OCD1YYHhCPi+H7bqsZQSTrPsBbhVbNW7gPhPGQvj X-Received: by 2002:a05:651c:199e:b0:2fa:fdd1:be23 with SMTP id 38308e7fff4ca-2fb831efb31mr16983921fa.28.1729253009668; Fri, 18 Oct 2024 05:03:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729253009; cv=none; d=google.com; s=arc-20240605; b=j9vQgm+Ov44bcQflWtgc2i0bKWIvb4UusKHEObU28qrBIc6SWtcx34JaEZJcK9JmQa uMPFsV5aN+5w2aF/xD895KX7JBvLOy9QKHGN2MLw/N4iZ5mLqVH6Y/1kjQ3raj2fUFjg U1EgfqEaoyMXxiJlenPBqMwIreoxI5hZTcd/QcgT1XgX7Lg7cR9ammz9aTrfls4beHWd 5ITZY1Rx9qW4ZAnlLeaovjNVBq04DQQBrFC/GFRM6uFoIDds+zSkVh398dfH7Y0ywy8o zjz/CDnAcA2HcsnIrgR3kxxlBxaQiHDa8ScwDEOJTnHUHdYrYAxu9O2qEGbz9+6trhfO y3Aw== 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:in-reply-to :content-disposition:mime-version:references:message-id:to:date :delivered-to; bh=o3zKH2KBiOaU0sFf3tbzE+Ffz+avfLqvNfDv8UuRwj0=; fh=12mN4pfzDNzdHyzKFbbDbvwqdgi/dxWu8iEqOdEdeaI=; b=A6DrzQkOCpx/r79IRKaUxoWStEciMMN1TLUhBR65G4U1huQyB7JQ2dFN270JjEOBvw Fjj/RWrC5N7Vo6Fxhh3zYPTnNbJsAqP91gsJu4+OKB1AChnT/XVGAzu/oEEk1KxeAa1G ayxNtwvfUAvPvApTGl3iecUiBVY6oHb34NOaRf54SpY9Ezn9kZNME7isQBoIejWRZLnE jwvRRJM6VlGPc76ppu+nOw0/4hG5kgwfOe7vcvGq3PmAehqk+X83tzCM22PHXIxSzFlV Bklmbk9YBE/jGrkNRLNLUXfYqaYfajyM3MKkXJtRQV+7EvH8WhRrILwZnIwKjYAHOSOs ukCw==; 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 a640c23a62f3a-a9a68bc464csi121820466b.436.2024.10.18.05.03.29; Fri, 18 Oct 2024 05:03:29 -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 25C2D68DDE5; Fri, 18 Oct 2024 15:03:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A6D8F68DC94 for ; Fri, 18 Oct 2024 15:03:24 +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 1MJVHe-1tLURP3mdk-00P1KV for ; Fri, 18 Oct 2024 14:03:23 +0200 Date: Fri, 18 Oct 2024 14:03:22 +0200 To: ffmpeg-devel@ffmpeg.org Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Provags-ID: V03:K1:z/9pw1Jy7a2iSmNAODqyPYkYkJ4mWMkakhHq3WXBk0XSjnJMts1 8YOsjZ478ARNx70NJ/DJt7rcqfIYsstbuJ1UeClC1DqMTXPo5/RcfFqEB9pj1q2o6HnJpwj vy/rI7OdRyzIOEXrjnkbtpF/r2rTau76o8/qRE3VKr2Ea/5zXrZZmENhS9jik2NyqR6tU4G d2gXEWBDL+p/C5rg8L+0w== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:lpc2vj68EOU=;lsokbqj2/FufIF1IOqW1yUOc1xu DwZlDd8el2Wd+HoTabOA6wsr6Ow0kGAfiJcC1tWBW7u6OBuEiUaATvJRj+QlR1GKErRx7cZK0 cA/qTjvSDO7QMWhfSGMuVK5Xqdug3wjDd7QAxuBOf680nVA8b+TDxtp4YE+1owrcA78XJadzE 2vgqH1sXdagO/OPpHCIdCIG6eVhEie15xu7Nry0mM0RbE90exp3qNLyFP0KjtfwG9LUyWH7eV SV1HtjRYFrqwKzRzCeILscqNn1tJ8YC0BdcBenNVKL5HPnrzYg9pKpdN5HVLpbqxn+SHEdYqw dKTZp6A4BEihM63NU2HLFviw9LY9i+nfs2QF8U7VCBaBf3/9arEdCvO2xHnwPGetP1FQ6a2l/ wrWpPYw+ZSSSQXy8Ii+NM2rA6TYHB/z7ZxdeL7aQHeHYlsi2/sQfSBMF8xKgmWRvvQlGFu/RA boYvCzYNzQ/HXz7DWKQDcPu8c+y70nYgk4z8k57bnvo9kQE41d7sR2bwENZNKOvQW2uqS949+ fgrjPJNHyVtxQIuwbgLLLB0g07yoOYVNjiHYYjRMR+98LDY4FYoYt9b1EYaupcC5LX48lie3o z5K007fhHp4VkFi6nsrpISVrrzE8PsIjIIYZgj99/J5uJramnb/Ui4ikxHVxDA/o9S++Ob1Lo sx1hmq0GjXeljUS7dCZnKFiTJQHtRJT3zYVphnlu+D6Iz5qh8yqqi43aRvvkty7nkYESyJsge aFN548LYgoy3dx9bN2ANW2JBruhLEmeu+7tPQmS+txi2kVKDkOFa1gVjYmSPyxMLAFObsCAVq Dj3G7uWbKRGjkegJ4dphf64Q== Subject: [FFmpeg-devel] [RFC PATCH 2/2] fate: Make it possible to have alternative reference files 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: GPq28xfvI7Qf Sometimes deps (external from FFmpeg) can cause different results either because of bugs or because of drop in replacements. This feature of alternate reference files should only be used where absolutely necessary because other solutions are not feasible in practice. Maintaining two reference files is a burden and updating one or the other can easily be forgotten. We currently have this problem with zlib-ng. On systems where the zlib-ng is used the results are different. In commit bce5855afb25d318e090c2e6c16117f065458356 we avoided the problem by using compression level 0. That fixed the problem, but introduced a problem with original zlib. This caused differences with 2 fate tests depending on the zlib version used. See zlib commit 8ba393e70d984d902b15b9e6876f4d0d38ae4be8 . After re-applying bce5855afb25d318e090c2e6c16117f065458356 this patch fixes the 2 mentioned cases for older zlib versions by allowing an alternative reference file. The files accommodate for the bug in the older version. --- tests/fate-run.sh | 10 +++++++ tests/ref/fate/mov-cover-image.alt | 42 ++++++++++++++++++++++++++++++ tests/ref/fate/png-mdcv.alt | 22 ++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 tests/ref/fate/mov-cover-image.alt create mode 100644 tests/ref/fate/png-mdcv.alt -- diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 309ab85134..72251ec571 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -652,6 +652,16 @@ if test -e "$ref" || test $cmp = "oneline" || test $cmp = "null" || test $cmp = null) cat "$outfile" >$cmpfile ;; esac cmperr=$? + if test -e "$ref".alt && !(test $cmp = "oneline" || test $cmp = "null" || test $cmp = "grep") ; then + case $cmp in + diff) diff -u -b "$ref".alt "$outfile" >$cmpfile ;; + rawdiff)diff -u "$ref".alt "$outfile" >$cmpfile ;; + oneoff) oneoff "$ref".alt "$outfile" >$cmpfile ;; + stddev) stddev "$ref".alt "$outfile" >$cmpfile ;; + esac + cmperr=$? + fi + test $err = 0 && err=$cmperr if [ "$report_type" = "ignore" ]; then test $err = 0 || echo "IGNORE\t${test}" && err=0 && unset sig diff --git a/tests/ref/fate/mov-cover-image.alt b/tests/ref/fate/mov-cover-image.alt new file mode 100644 index 0000000000..bb94b86939 --- /dev/null +++ b/tests/ref/fate/mov-cover-image.alt @@ -0,0 +1,42 @@ +ad553810e0ce362697a2b21544daebde *tests/data/fate/mov-cover-image.mp4 +2063262 tests/data/fate/mov-cover-image.mp4 +#extradata 0: 2, 0x00340022 +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: aac +#sample_rate 0: 44100 +#channel_layout_name 0: stereo +#tb 1: 1/90000 +#media_type 1: video +#codec_id 1: mjpeg +#dimensions 1: 600x600 +#sar 1: 96/96 +#tb 2: 1/90000 +#media_type 2: video +#codec_id 2: png +#dimensions 2: 600x600 +#sar 2: 1/1 +0, -2112, -2112, 1024, 6, 0x027e00e8, F=0x5, S=1, 10 +0, -1088, -1088, 1024, 6, 0x027e00e8, F=0x5 +0, -64, -64, 1024, 6, 0x027e00e8 +1, 0, 0, 0, 25441, 0xe82503b0 +2, 0, 0, 0, 1084000, 0x70fc8139 +0, 960, 960, 1024, 6, 0x027e00e8 +0, 1984, 1984, 1024, 6, 0x027e00e8 +0, 3008, 3008, 1024, 6, 0x027e00e8 +0, 4032, 4032, 1024, 6, 0x027e00e8 +[STREAM] +index=0 +codec_name=aac +DISPOSITION:attached_pic=0 +[/STREAM] +[STREAM] +index=1 +codec_name=mjpeg +DISPOSITION:attached_pic=1 +[/STREAM] +[STREAM] +index=2 +codec_name=png +DISPOSITION:attached_pic=1 +[/STREAM] diff --git a/tests/ref/fate/png-mdcv.alt b/tests/ref/fate/png-mdcv.alt new file mode 100644 index 0000000000..1339fe3a46 --- /dev/null +++ b/tests/ref/fate/png-mdcv.alt @@ -0,0 +1,22 @@ +b674209fd9cd8eff945a6bc1a4b306d3 *tests/data/fate/png-mdcv.image2pipe +2774240 tests/data/fate/png-mdcv.image2pipe +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 1280x720 +#sar 0: 0/1 +0, 0, 0, 1, 2764800, 0x2bfc7b42 +frames.frame.0.side_data_list.side_data.0.side_data_type="Content light level metadata" +frames.frame.0.side_data_list.side_data.0.max_content=1000 +frames.frame.0.side_data_list.side_data.0.max_average=200 +frames.frame.0.side_data_list.side_data.1.side_data_type="Mastering display metadata" +frames.frame.0.side_data_list.side_data.1.red_x="13250/50000" +frames.frame.0.side_data_list.side_data.1.red_y="7500/50000" +frames.frame.0.side_data_list.side_data.1.green_x="34000/50000" +frames.frame.0.side_data_list.side_data.1.green_y="16000/50000" +frames.frame.0.side_data_list.side_data.1.blue_x="2/50000" +frames.frame.0.side_data_list.side_data.1.blue_y="0/50000" +frames.frame.0.side_data_list.side_data.1.white_point_x="15635/50000" +frames.frame.0.side_data_list.side_data.1.white_point_y="16450/50000" +frames.frame.0.side_data_list.side_data.1.min_luminance="50/10000" +frames.frame.0.side_data_list.side_data.1.max_luminance="10000000/10000" From patchwork Fri Oct 18 12:15:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Strasser X-Patchwork-Id: 52386 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:143:b0:48e:c0f8:d0de with SMTP id h3csp867869vqi; Fri, 18 Oct 2024 05:15:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWlfDGGAh/esR5TYkVwP7c3NnMXMVLq+FBceuXqIvBRTPmtOZMkj7bERcAhbBf0ggOJaW6s1tz3cczTZofX93pY@gmail.com X-Google-Smtp-Source: AGHT+IGSjW35P0/5CSfKjtwbDRuobJNB5PabPD5oxxR9ILt6+q5lD8bgFS6Hi1LB496SPtiCLn3g X-Received: by 2002:a17:907:3fa5:b0:a99:fcbe:c96b with SMTP id a640c23a62f3a-a9a4cc3aaacmr684896766b.25.1729253731594; Fri, 18 Oct 2024 05:15:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729253731; cv=none; d=google.com; s=arc-20240605; b=Hb51yHSiUfV14C6ra3cWeNiqwvIXaW1KjtEp00NtWNRmY7SCXHb1HBRohh9yd+KlNt S9WOzt48z7ur+2Dvihirc7YcJcuJzbPw3iZ97piYuWH7G/Ic+LKCUTPIf4P7uwIPtM6K joUgmtfTJgTCg7RSRLbLhGPhnU6mI/oO7IgXILNP+qvZK8epPkuFHpPexoOv5Gycc+w4 I0YEwKLyDpW+T9C8kTbPCth9TGhzUYdJHsc3QJY0fXloc9kAMxqzyXF+CN9Iv5UgfiQe wMxBKrcsYVjyKOBiBuAWU2ijDzQcC03BadBJySTJi/qtuArBgMm0AnBjYvNEIoOkdooH oTaA== 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:in-reply-to :content-disposition:mime-version:references:message-id:to:date :delivered-to; bh=OnbfwDK01jjAEHunFPeoqQ5n1ZL6ynjmNtQRp9BoaBw=; fh=12mN4pfzDNzdHyzKFbbDbvwqdgi/dxWu8iEqOdEdeaI=; b=dzu/9NrEzRymIQQiNss8DkG7jh+RBqTerU6WV848I+ojt+HNpATovxgTWbMCeiicM1 G5Gb1PvFy5q60DyTVS3D85EIpdJLIVU79ycdtNoMx+aXZv7Lm5VQe3sxHGQ7dpptPQgD ljzjyXvMMsfDEs1jL4CoOiCfv7kplGfRemO/1jwZLU8DRJquo9LG9VJ3V+Jm8uGtDCKt f5x/PmZxSItyb77D7F7OcmscaZFaOlvjP/2/58AlQtbcaMs456swTxbBSJaU5IKV7Uv3 eCenSKOBHiaxTstz9lzZo747BqNzJUgW/etXgI/WgpQbxTZFnGjl/DBbAJNa11SVRnFU ND6A==; 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-5ca0b10c075si996629a12.417.2024.10.18.05.15.30; Fri, 18 Oct 2024 05:15:31 -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 39F2168DDAC; Fri, 18 Oct 2024 15:15:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CADDC68DD94 for ; Fri, 18 Oct 2024 15:15:20 +0300 (EEST) X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from metallschleim.local ([91.4.239.114]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MwfWU-1tpsf40KZG-00yDBB for ; Fri, 18 Oct 2024 14:15:20 +0200 Date: Fri, 18 Oct 2024 14:15:18 +0200 To: ffmpeg-devel@ffmpeg.org Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Provags-ID: V03:K1:gMaJO/HhEaR2b4qVG3+Zjv++qV4WkMlLHmB0vMoBc8OMPc/DsKa U1G++phnvWrUd+VadMiZJDJqJTUuBfjJqdwMWRSOyAGqpLTX/LtZ6ub+wQRpG/Zo5voiOc3 omuWma0NPgCL3Qqfd+uzersCsmLUAIt7wjYj/opjsbwyBv5ERXcfW+Sn4qB3ooiaMlqKhWH qHrNeLzMjinSYKxpU21Tw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:uvMNZ8jQjwo=;qBMBg1zMD+Bca2aAS9kSedkCZ+0 6XP43gFJx3igA53d2ir96kgiaxquM5V8YHnBT/8bzTrEaz4NyZRXySjXbrArzhMfVYUfeDwJv d8Z4wp4zBiPVFwkQqOLZKaiA0LQVe2ON8LcUVkdBS2QC5355769zDjD7LPCrSQbs7cUAQsiOp 1NNya4rlcySQ8cmKGExSg4152mcwt1zPFCejPqdPs2ctqJWGS1dMacMLnpAbr06/iViZf6Z7c HKDSRqrOZGopYTLUvuHFDRuY7YLVKw2GrGvRttcISH/eyi31ICA4DChmilfX4f8UzNCdHvhfV 2krMQaMh6JlHzBvCKQjENsbv/6nRiA/mQKG8geuyarun39lTitrc+iY1qyDjj1NH8z1QwrqNx Yv2bq7U3hw2dXwM7YRWvSLAUWTB6eBiepgCv3zAZk9g0yOL1oSc0G7yIo4t3HfZ/dZgWga4H5 wFCPvQGB41oZabdZuXlkEsN6Sdi87/OMBwWPjRThWBvmOe+5UBTc3bDSCibbMj43Ib41EekGA 7XAcXPN9I7GzDoK/Mm9TmqEPWJUEesEFlz0yJfV0xCnwTEgjXGAnt+93LYKdMP19ogI9Zmbkl nHURuaHL9aERfA1YmScYi8bKlRh8gcLe8xp6HbdczmQcJYe+8QKCTA9aPLkyAXPVGkbN1/8l8 5Qi9zlhAK+3AxxrQrD9CaedwhyEF2gzkUETUoUPzdomS+lZvK+/iEX4cdCF33TLFVkHGqYrtq 2BOhKVdxqmPB5bWyQI/SyakgOfS2fn8MZ4rzrpQaY0sHEtspwMlv3F9Qpg3i+lJUMqKE4gR2/ 8TJsDM9F6BcN5fRxLxM5kuLA== Subject: [FFmpeg-devel] [RFC PATCH 3/2] FIXUP 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: OosGsngogah0 --- Sorry I forgot this fixup to the previous patch, that I had in my work tree but not committed... tests/fate-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 72251ec571..bed8f7127c 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -652,7 +652,7 @@ if test -e "$ref" || test $cmp = "oneline" || test $cmp = "null" || test $cmp = null) cat "$outfile" >$cmpfile ;; esac cmperr=$? - if test -e "$ref".alt && !(test $cmp = "oneline" || test $cmp = "null" || test $cmp = "grep") ; then + if test $cmperr != 0 && test -e "$ref".alt && !(test $cmp = "oneline" || test $cmp = "null" || test $cmp = "grep") ; then case $cmp in diff) diff -u -b "$ref".alt "$outfile" >$cmpfile ;; rawdiff)diff -u "$ref".alt "$outfile" >$cmpfile ;;