From patchwork Wed Aug 25 19:20:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 29776 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp836027iov; Wed, 25 Aug 2021 12:20:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJygobFhY63bSrjxPjglz8FIWOHx3FHMVKw2I5eVk9SmlH6PK5j71ZTSvCOOjz9g7W8KXS31 X-Received: by 2002:a17:907:9688:: with SMTP id hd8mr224892ejc.484.1629919238691; Wed, 25 Aug 2021 12:20:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629919238; cv=none; d=google.com; s=arc-20160816; b=wvdNQo9ZOX6zgXeEW6D6MATlyYf5VYO7NnfZ885lUJ1hDXOAc4IV7EXhIWMDgkQMej EFP0uVmjRpGkm8n9gNCpUsX++vislqIukdjqpgRcja676HJeIIM5RD1hwtAQwev2klPf 57feGMmUdEkKydAcmMaXRXSE3+R82nuCDAwJbIIsB+U1oL67YGyOgZ0XSeJ95LuQZizB L30FNCTG/sXX2YVurjvOSdctjoRtdfeKqR7cAelJDEUgPaYcSD1IAHgm2CD4yQR1eEgD pcZBJ3goSnDh6Q4TnpGccP9vo2ARc7YF5/OS9OKItyV3TEyznoBdJHpAkVomhHGoX8ZE WPDQ== 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=919o7Ph7Zp18+wvumkAI/Fyib2N3p7PbYhsJf1WJN5E=; b=FcyF/85ymFm5L5wadyOtG8KncITA0wbKVTq8VzOhT+pjWR80uVSb7VRE2pCF5e8yWG LTFDlDTUzaC7CvsdmpHPKspj3RURkopHd9gop2Ef0xvifI4Qrqv4042LjEgRr/H1DQBN e4DJMyTw159CM5sBSIcQxptj87elbwNYFEdyTahVLJ0fKMM4MHfu2vowHM/Zq5KA6Yf8 X4188LFmrpESCdNkBB2mflxLc2kj2PEmiz8WvDH3y1oCCmpr2WTSH28Rtw53GAzpWnfP u+OIcccYBhAzsk4SJeRQfBLh3NMKtHYP6dLDh1Av6TBkC9qhXzq+oELLIKp0OFbRKXHw EMXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20150623.gappssmtp.com header.s=20150623 header.b=k9GCA5pD; 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 qa20si498811ejc.447.2021.08.25.12.20.38; Wed, 25 Aug 2021 12:20:38 -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=@martin-st.20150623.gappssmtp.com header.s=20150623 header.b=k9GCA5pD; 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 E6EB568A26E; Wed, 25 Aug 2021 22:20:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EBB7A68A0E7 for ; Wed, 25 Aug 2021 22:20:27 +0300 (EEST) Received: by mail-lf1-f46.google.com with SMTP id x27so1186415lfu.5 for ; Wed, 25 Aug 2021 12:20:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rMSA4W8vmjFsSnYrxojgnpkVpoO2OBC6Rv5esSuDil4=; b=k9GCA5pDhEWRBkzZ/4pjpWSqFIACcDZlDDF/JXa6J2eNpCuEtXcOE3+48NP7MUIkP3 n9Cm33VVH0xvdYP77GjBU2oAjAIDxhXXEjIBN2/cbwGxJWDOylszME+aQ0eyRshwwWe8 u7CI6TUPP7QpFMPqmMzrHt+TCSg3wdP1dF3GeNw1oX6uB3NUMDFUuC9g3A8MXan5CdjZ cFtbUjfzl+kAhHogVqZH3FtaGvnHNHI9JrvXJqF3o9FGw/pXKkyb0u6Q4YF49LyRVBnF nAOZw6CT/E+6djMWeC7xPogmOfYE4lZIwjnciz+4Aqz56l9BEETKiuSd7OTaBGl/H62Q ZCWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rMSA4W8vmjFsSnYrxojgnpkVpoO2OBC6Rv5esSuDil4=; b=uPfwePXWkgQQ2Ya7vMthlPcguVd0Rc6xwWy6YpKNx1szuq9L6x7Z5m3vBxkLmdHBqt vTRzEH7GFDs4VAI2W0o4gzT6K4K5xYtnqV4nBSc8P6tHLgCYfA5CZUyz0pMRAqkUp3hz ly3fUu/ozhJax18Dfb/ehcE47R4HZe+eascuBmiTLHswTebU+gZfd2NsqTlFpJcllKam iWMoJBElD6eh4RIgEFP2sfnKZ9gfzuBXhg0N7FtV0fmQZkR1MCp2nTfhb8d8wPq41WCy +WG1pirc35EzVmp3MkFIidMqpXzboyDuVdJKovDW2/W/Lmm2+dqIVPVxQKFENW5Ja7eC BC1A== X-Gm-Message-State: AOAM530uTh1B12tZsCEExrA/+9UdD1lfZ44PIaE+HRLmG+Uxxbyo2nmx M8cSzlUQuIaVC1wnvfX30L4A+e5NXwZCaG3P X-Received: by 2002:ac2:558e:: with SMTP id v14mr5059939lfg.424.1629919227184; Wed, 25 Aug 2021 12:20:27 -0700 (PDT) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id y21sm20926lfl.26.2021.08.25.12.20.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Aug 2021 12:20:26 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Aug 2021 22:20:26 +0300 Message-Id: <20210825192026.1746518-1-martin@martin.st> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fate: Fix mp4 ttml tests on Windows 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: =?utf-8?q?Jan_Ekstr=C3=B6m?= , =?utf-8?q?Martin_Sto?= =?utf-8?q?rsj=C3=B6?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: UsUWhR4MRuJW Override the fate-sub-* wide comparison function of CMP=rawdiff back to the default, CMP=diff, which ignores line ending differences (where the ffprobe output contains CRLF line endings). Signed-off-by: Martin Storsjö --- tests/fate/subtitles.mak | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index 880109f201..0c26f582e0 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -110,7 +110,9 @@ FATE_SUBTITLES-$(call ALLYES, FILE_PROTOCOL PIPE_PROTOCOL SRT_DEMUXER SUBRIP_DEC fate-sub-ttmlenc: CMD = fmtstdout ttml -i $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt FATE_SUBTITLES-$(call ALLYES, FILE_PROTOCOL SRT_DEMUXER MOV_DEMUXER SUBRIP_DECODER TTML_ENCODER TTML_MUXER MOV_MUXER) += fate-sub-ttml-mp4-stpp fate-sub-ttml-mp4-dfxp +fate-sub-ttml-mp4-stpp: CMP = diff fate-sub-ttml-mp4-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" +fate-sub-ttml-mp4-dfxp: CMP = diff fate-sub-ttml-mp4-dfxp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000 -tag:s dfxp -strict unofficial" "-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" FATE_SUBTITLES-$(call ENCMUX, ASS, ASS) += $(FATE_SUBTITLES_ASS-yes)