From patchwork Tue Dec 21 07:46:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 32774 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5175964iog; Mon, 20 Dec 2021 23:46:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJymLul/ygziYV37iPfF1yOhq9sfe6APPEf4PytNtC9n6FMy3hxFjCPgEb8qXXDJSrDp2zlx X-Received: by 2002:a17:907:7248:: with SMTP id ds8mr1709078ejc.401.1640072780363; Mon, 20 Dec 2021 23:46:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640072780; cv=none; d=google.com; s=arc-20160816; b=C6KIuR9zmFq0GjD1eve0eZjXFNR34mouFMhMZR6ou+7jQVP4eTwVNNpYKl49vEY763 6Qg9M4/NdtilhB1W+JEGJfnUhgxLYt2w2ACXQP6hutvnDBH7qVpLMY8xdLPT9ikCI1ji zlYQTd6l/2bwdx+1X9vm8XG9JPXkQ/2e8f1uid40PIs2BmAF8o5X0H/XN0jnYyTwCx7N eA+S5YjmSdbpIZOWgwgIM5KfKID0hYqreUoUPWSeOPRHThIEMVKa8FvmexbRn8Yi6R7m 1HqhAPU7QkCwwQ3L17eY6wqFn1UDnx68VyoSoHJKkidRlLYlhR20oZCiOuydbNo91+Fc msjg== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=ycO89kaxGraqbEStdlKp+nIhP3wp/4ZExvPKrBmmnRg=; b=Qq6h8l1EpxmQ/Gn2nzLXIIU5YiWVTFb2EvRVAckgxEBWsoPVBwFxCT+l6pRrzfBsfl F0w7rG2UWTVjos8wM6vU2VOB872DTXJKSLtB3wPH2xXlz0H2gwQvxQ29eDlC4ctj6Af0 2sj2EncwWZxTD/x9B+GJmjPQj2eGhiLKQbFQMzFLZJ+Zc6uTAemvrO2BtAvBge55MvXU 03H/Zw/AfyDUApDA6smKRNo6qpCkKWgT0c2pxhigOOoskLnPNAPSZSEA9OWHnhcGbkm9 vcjvUQd0kkjhXGPxlVHikx18wCuPsfDXD0QEBlXvRKtwP9EkXHLwBRDVUyONm3eaH2Pv LcLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=O5CE5SCK; 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 e22si11115763ejz.333.2021.12.20.23.46.20; Mon, 20 Dec 2021 23:46:20 -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=20210112 header.b=O5CE5SCK; 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 4984C68AF4C; Tue, 21 Dec 2021 09:46:17 +0200 (EET) 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 2DC9D68A2B2 for ; Tue, 21 Dec 2021 09:46:10 +0200 (EET) Received: by mail-lf1-f46.google.com with SMTP id x21so19182724lfa.5 for ; Mon, 20 Dec 2021 23:46:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ONLOeLARxszBkvWXFfGXzJhqHhBR62vs1FmkS9a3+YA=; b=O5CE5SCK0IDWVwe73WWCBNN904STu6BmQwxA04fzHCgfcsQx9fb99zxyqcNSIngE3i mYuhbGmRQlnjsTH+fCdI2pBx/7DeTdesjQwlLOdtFeoK278Dh64ZYBBcA7ycGSr6ClIK RkFpDyweOzMR2FtPc6dQ37h0ZXeZy+he3wSoPhgRIdNyO6+OSws4GebtYgILIlPjeS0q vya9esW+YkNnJnMKF+xYsD+eiCN48Qsi5qzXeU2/qgiXolNd9NzFWHFLfUOkbySdTUzp Q+nXqAmEmtJH12RslQnijI8hqz3RTBtbwgyx5qyxTKrwoVg6a0W7Fqq5yV+dB69Zbb/z 4lAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ONLOeLARxszBkvWXFfGXzJhqHhBR62vs1FmkS9a3+YA=; b=ULsprWTrQg/GvRxpXvk30zE56ePLMxdSZAq2QfjDT2tVrL2T5XOhPEE2RaoeqxcJdm O3QwwZ57g3lWMHhOrlv4JqJRbkjfUilWpvGpym08ehaMBsCYPUgLSklp9HsUOAOy7WyR VEZeq3uTVvjORvD5jySf4XaosuzNTlho3gF1+9wA62PlFbTy3kjJg7e/MUvF5ZcugHVw J23cdEKvojcovBEJ7QPL0t7SU17Ovg1d7nKR44W4JsTCAUCFUBg6nJSYLmvPlSB9+Kl9 dMv8uZbHklAzX3Vt/oVpl1YCxEMQgDt5vY3/7gP2u61ZbykG/pDo97O7tUmJa+V2sxHz z0qA== X-Gm-Message-State: AOAM533Z1/sZpGXyGT6CgjDYM0VQzwfRah8JYtQYNXhFys2alwIoPcce UR1EPxZ8L9miXRKAV9yukYEsG0lSxFA= X-Received: by 2002:ac2:43ca:: with SMTP id u10mr2020361lfl.520.1640072769459; Mon, 20 Dec 2021 23:46:09 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id y10sm195037lfh.165.2021.12.20.23.46.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Dec 2021 23:46:07 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Dec 2021 09:46:01 +0200 Message-Id: <20211221074601.12074-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211220172236.9515-1-jeebjp@gmail.com> References: <20211220172236.9515-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] tests: add test for ffmpeg's fix_sub_duration feature 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: 9A0IjKvNFbYK From: Jan Ekström Signed-off-by: Jan Ekström --- tests/fate/ffmpeg.mak | 11 +++++++++ tests/ref/fate/ffmpeg-fix_sub_duration | 31 ++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 tests/ref/fate/ffmpeg-fix_sub_duration diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index 4ba73a8dfa..ff321eba7f 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -94,6 +94,17 @@ FATE_FFMPEG-$(call ALLYES, FILE_PROTOCOL LAVFI_INDEV RAWVIDEO_DEMUXER \ fate-shortest: tests/data/vsynth_lena.yuv fate-shortest: CMD = framecrc -auto_conversion_filters -f lavfi -i "sine=3000:d=10" -f lavfi -i "sine=1000:d=1" -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -f rawvideo -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth_lena.yuv -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 2:v:0 -map "[audio]" -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -dct fastint -qscale 10 -threads 1 -c:v mpeg4 -c:a ac3_fixed -shortest +# Basic test for fix_sub_duration, which calculates duration based on the +# following subtitle's pts. +FATE_FFMPEG-$(call ALLYES, AVDEVICE LAVFI_INDEV MOVIE_FILTER \ + FILE_PROTOCOL PIPE_PROTOCOL MPEGVIDEO_DEMUXER \ + MPEG2VIDEO_DECODER CCAPTION_DECODER \ + TEXT_ENCODER SRT_MUXER) \ + += fate-ffmpeg-fix_sub_duration +fate-ffmpeg-fix_sub_duration: CMD = fmtstdout srt -fix_sub_duration \ + -real_time 1 -f lavfi \ + -i "movie=$(TARGET_SAMPLES)/sub/Closedcaption_rollup.m2v[out0+subcc]" + FATE_STREAMCOPY-$(call ALLYES, EAC3_DEMUXER MOV_MUXER) += fate-copy-trac3074 fate-copy-trac3074: $(SAMPLES)/eac3/csi_miami_stereo_128_spx.eac3 fate-copy-trac3074: CMD = transcode eac3 $(TARGET_SAMPLES)/eac3/csi_miami_stereo_128_spx.eac3\ diff --git a/tests/ref/fate/ffmpeg-fix_sub_duration b/tests/ref/fate/ffmpeg-fix_sub_duration new file mode 100644 index 0000000000..9cd36d4888 --- /dev/null +++ b/tests/ref/fate/ffmpeg-fix_sub_duration @@ -0,0 +1,31 @@ +1 +00:00:00,968 --> 00:00:01,168 +{\an7}( + +2 +00:00:01,168 --> 00:00:01,368 +{\an7}( inaudibl + +3 +00:00:01,368 --> 00:00:01,568 +{\an7}( inaudible radio chat + +4 +00:00:01,568 --> 00:00:03,103 +{\an7}( inaudible radio chatter ) + +5 +00:00:03,103 --> 00:00:03,303 +{\an7}( inaudible radio chatter ) +>> + +6 +00:00:03,303 --> 00:00:03,503 +{\an7}( inaudible radio chatter ) +>> Safety rema + +7 +00:00:03,504 --> 00:00:03,704 +{\an7}( inaudible radio chatter ) +>> Safety remains our numb +