From patchwork Wed Aug 25 19:52:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 29778 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp858656iov; Wed, 25 Aug 2021 12:53:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwF1KLWcxOsYDmziE/GJSvqPLnbnYMWWTXQ9sL+917YriJ4uMSM/4NtAz6QIEbmVk4V6jyU X-Received: by 2002:a17:906:1146:: with SMTP id i6mr357573eja.12.1629921198802; Wed, 25 Aug 2021 12:53:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629921198; cv=none; d=google.com; s=arc-20160816; b=qGaknk9fvykNuCQ4kFcPi1jGrjmXubMJdaFhY7cKuWTEWswzqJGyWLe0dXoG0mp428 DnOxPo7U5r8ZKf06nNctSCsP1X+16OZMUkjegxNuqf8napaiXqCN23vvc10N8OCkTGyT irxglr6LsKk4DPAVTVii6Cn8GKhOrvBXULnwyWuYSuvsrwrYXCIjlc7VoLd3rTVenE97 sHwLBk+CwD7ZbQYC10gOgv5nuKFA4H2Mz6EGGRBNQXHYXVzdzNWdfSWlmQoppCTfO/5B p2kwmgYqqSLf2xBATYy1hN0yYHGJVJtGAxRLZ3baSBv/MsnXRnyjGaAVVLOHhZQqmwED YJkQ== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=1VxxIH4kqVF2yRqZslzW1dAtIDLbRfJE0Rl/ELxk1kU=; b=McXOcC9rE/oIufo3cUppbXVRVlnN1y9NcNX5Y1dJE2bAywxQ9OROp6UuuZPMfMg7WD s/qPW3rZFeoJn13yWMwkh1tVzEFhIy0JPhZcswmJuzRLpFlqA95YO4TcEp0IiJs06crV KtSyGy5qOCL/yHJ+mip6hdpU6cqlh6FYvEoS2gvBQbNxquVjQNQQ54bazgfU3FxYapmT c7qi/iXYOdeF+TGDYZkLgjFGy/MjNXAO0LXSgf+mQOJAHydccn8bJrcc2XbySr1hu7bP L2afShDHH3FZDD0X25VqeSdXzVJYWZt2/xBAGxkOWxVVSkwCjn6ZQGynovw0RjSSvZL9 CQyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VD+cY6g0; 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 17si649257ejx.425.2021.08.25.12.53.18; Wed, 25 Aug 2021 12:53:18 -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=20161025 header.b=VD+cY6g0; 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 5BDA968A10A; Wed, 25 Aug 2021 22:53:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CEC04687F21 for ; Wed, 25 Aug 2021 22:53:07 +0300 (EEST) Received: by mail-lj1-f169.google.com with SMTP id f2so705266ljn.1 for ; Wed, 25 Aug 2021 12:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=TTIz6WZ70dO8Oc7xbYhy/udh7gQMT47MyWN9yk9frok=; b=VD+cY6g0XPZ41yv+EEYEEMjQEJEhLSdWYNMn505gl01FT3DqGDHe9la5rtg+SoGtDl 1kQBtBudwU10M5LDJ09tK+rZ5DP6t4UHFp6F/YLa6sK+DHIlvL3Vyil/uZzPoTV8AM8h cULvuLz+Sf3poVy/mD1G8RoZ8BKUo1zAw9wkvZNWX5HQUefOOPYDnpUv0+/NuFlHUs4k ou9ga7MOwG3FtxkgCI/pCwHUbEAJ9GM8l5qGNenrRdERhiVrxawqiuHjxIyJ0BAjBsEQ p7GlQZ/tp9+juko25h+4hDlIkxwUIH0qxQoT4seQM5Du0LxV3xCLpqtAr2d4yRlgtSVk zx3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=TTIz6WZ70dO8Oc7xbYhy/udh7gQMT47MyWN9yk9frok=; b=t1dCk4xUnCvjJPNhtuasCtZHguereE23SexQ6G/RO4tFgz3AgkQK3IGY+nV3bY2bAj 2l+rr8gygga9Y9J7vBG4PB2ph2zQEDqPNf7xuHe3D0Q9Ctv5Yx5AFmM2ywwdyPDvvJOo ijTTmf/qqD6RGpk1bGNui4ile5jScBm8kaDEgstlKtq5DnMt/T7IoJWNYgX03HoLL2cc 7VYKMqaXHRzF4929FMvT3wSG7Hycba8HqyngKIeT9HlZC+Xw+7M3L2PIZvieQUWimK3l Qs2/jFD4JFHKCDYPXji+cYhZ2N+u83PkcwfVyxPd+0q/xrWlxA4AfULayAiwVktiedvK Zs5Q== X-Gm-Message-State: AOAM5320DzDxHNPA9tm+E5liTOqntzL3zryzZxCZQ/wHyMs0huNkZhZr uyoPqI9i9okVKPBW4SEuY+FGecFO+fM= X-Received: by 2002:a05:651c:10a3:: with SMTP id k3mr31609251ljn.471.1629921186379; Wed, 25 Aug 2021 12:53:06 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id y14sm102443lji.89.2021.08.25.12.53.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Aug 2021 12:53:05 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Aug 2021 22:52:59 +0300 Message-Id: <20210825195259.48125-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] tests/fate: move TTML-in-MP4 tests from subtitles.mak to mov.mak 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: Esa1UQtETrSp subtitles.mak utilizes a more strict comparator and - to be honest - the tests feel more at home in this location. --- tests/fate/mov.mak | 4 ++++ tests/fate/subtitles.mak | 4 ---- tests/ref/fate/{sub-ttml-mp4-dfxp => mov-mp4-ttml-dfxp} | 4 ++-- tests/ref/fate/{sub-ttml-mp4-stpp => mov-mp4-ttml-stpp} | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename tests/ref/fate/{sub-ttml-mp4-dfxp => mov-mp4-ttml-dfxp} (90%) rename tests/ref/fate/{sub-ttml-mp4-stpp => mov-mp4-ttml-stpp} (90%) diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 4c1014be92..0c9177aa81 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -132,6 +132,10 @@ FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER MJPEG_DECODER \ += 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_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL SRT_DEMUXER MOV_DEMUXER SUBRIP_DECODER TTML_ENCODER TTML_MUXER MOV_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" +fate-mov-mp4-ttml-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_SAMPLES_FFMPEG_FFPROBE += $(FATE_MOV_FFMPEG_FFPROBE-yes) fate-mov: $(FATE_MOV) $(FATE_MOV_FFPROBE) $(FATE_MOV_FASTSTART) $(FATE_MOV_FFMPEG_FFPROBE-yes) diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index 880109f201..ee65afe35b 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -109,10 +109,6 @@ fate-sub-dvb: CMD = framecrc -i $(TARGET_SAMPLES)/sub/dvbsubtest_filter.ts -map FATE_SUBTITLES-$(call ALLYES, FILE_PROTOCOL PIPE_PROTOCOL SRT_DEMUXER SUBRIP_DECODER TTML_ENCODER TTML_MUXER) += fate-sub-ttmlenc 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: 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: 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) FATE_SUBTITLES += $(FATE_SUBTITLES-yes) diff --git a/tests/ref/fate/sub-ttml-mp4-dfxp b/tests/ref/fate/mov-mp4-ttml-dfxp similarity index 90% rename from tests/ref/fate/sub-ttml-mp4-dfxp rename to tests/ref/fate/mov-mp4-ttml-dfxp index 0172e5b7e6..e24b5d618b 100644 --- a/tests/ref/fate/sub-ttml-mp4-dfxp +++ b/tests/ref/fate/mov-mp4-ttml-dfxp @@ -1,5 +1,5 @@ -2e7e01c821c111466e7a2844826b7f6d *tests/data/fate/sub-ttml-mp4-dfxp.mp4 -8519 tests/data/fate/sub-ttml-mp4-dfxp.mp4 +2e7e01c821c111466e7a2844826b7f6d *tests/data/fate/mov-mp4-ttml-dfxp.mp4 +8519 tests/data/fate/mov-mp4-ttml-dfxp.mp4 #tb 0: 1/1000 #media_type 0: data #codec_id 0: none diff --git a/tests/ref/fate/sub-ttml-mp4-stpp b/tests/ref/fate/mov-mp4-ttml-stpp similarity index 90% rename from tests/ref/fate/sub-ttml-mp4-stpp rename to tests/ref/fate/mov-mp4-ttml-stpp index a5165b568d..77bd23b7bf 100644 --- a/tests/ref/fate/sub-ttml-mp4-stpp +++ b/tests/ref/fate/mov-mp4-ttml-stpp @@ -1,5 +1,5 @@ -cbd2c7ff864a663b0d893deac5a0caec *tests/data/fate/sub-ttml-mp4-stpp.mp4 -8547 tests/data/fate/sub-ttml-mp4-stpp.mp4 +cbd2c7ff864a663b0d893deac5a0caec *tests/data/fate/mov-mp4-ttml-stpp.mp4 +8547 tests/data/fate/mov-mp4-ttml-stpp.mp4 #tb 0: 1/1000 #media_type 0: data #codec_id 0: none