From patchwork Mon Jan 10 13:28:07 2022 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: 33177 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2724034iog; Mon, 10 Jan 2022 05:28:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJw/E2pUzOFvpAMEHr0dgu77hJYTuXZIK12OaAz4xPCb4ifFA4xAx03XgLBkqbDWXh3xg+Kv X-Received: by 2002:a05:6402:1771:: with SMTP id da17mr21469340edb.391.1641821304094; Mon, 10 Jan 2022 05:28:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641821304; cv=none; d=google.com; s=arc-20160816; b=ojIaFryD+z4CvpJZKFzeD15ytHQ1G8hdC+vRR9Q9w5yWOvhnq/VlocgnGFSZ7+LFRd d8XyF7nlFYMAzXUlhffJUohEIOg4iSj166DZXuu9rEhHhcDVqVnrY/Zy6nEpAbdasKG6 K+W2EN1KZum34lKEmySD/Yqgarfa5APEMDrAOnBITKhVEpB41jWgMk5jc5QfKS7A0KSj qcNPtLIZ+36eWBfLeEZJvxUqPJp2vtV2lm69xhqDIaBh2EOLYocY5X56Tly4bdVy2lul VrrulzlQSyEDJAeMxGUVpUC8oemfyKj5Gx9js0Xg09XVutHtlEJQs689sifRG1E+XtJD moRQ== 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=XA5xep2Yz6VpwPHqqM7Xh3xZuzMjQRxU0yhDWjLfwaM=; b=xaRo/nGQxw4Db51bRGEemheK5ma1bLHOhl00aQNbwr1/r5T1An0faXKNwOEbNPGvTW uZBjps4DYVlviGvX/z/64pNqEY5tqzprFvUF7JoGpjmDYi/KlLP6MbBqt4PDYHvpDiGx 6fFjP0e8xctemqkfYwnF0zDzlzZXJEJgC/RkbloScoK3ta0Ae+HrEKwWWiu0VNGMrbPB 1W3Phh8cYl/gkdesUzIlBcX4HN4k50dL3RkAiFYRkwNk29smNZMn7jTpxnwXRciNt0+d PWtubfNPJ/OY23KSdC6doD0rmYCs1pILw7ciNRIxzu41zQESV9G7bInPaMQKc/yLWHPJ 3DKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=TqbxuWzn; 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 p4si4017192edj.26.2022.01.10.05.28.23; Mon, 10 Jan 2022 05:28:24 -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=TqbxuWzn; 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 F35B668AE34; Mon, 10 Jan 2022 15:28:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9397968AB9D for ; Mon, 10 Jan 2022 15:28:13 +0200 (EET) Received: by mail-lf1-f42.google.com with SMTP id m1so11115416lfq.4 for ; Mon, 10 Jan 2022 05:28:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=37LYXDo9myLUX6usmwvN4h3yJqUnHe8ysAbxcllQkzY=; b=TqbxuWznCkp0OrwxcjB1144Ng/shugHpNZArJb+llRTlQRS9vWmT9F+ng1IFANzuv5 6phsV2qCN+XLQo7MCQ8yh7anWbj7fQiMAidV9agjGKMdU2XzTj5XYX6s82Zxg7WSI2RK JQKhlYBvDc+xn6lnTCB7b3M2WlXOeNEru8u7m1JXIVPXKSFRoOc1OS409AEpYMRmKYRm NBAynzfvyfqSDn2enl7dsXB+KP8gEwEcHQo/v62RlCcn8Fza/kYNqtSSB39MTyL/n+BE Ozf8JKsV3TdbytH76zLT5p+GQRFqxpTZuarRygs2bZT7aziafZQ/IcIPf0MOKvAxcv7q 1XNA== 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:mime-version :content-transfer-encoding; bh=37LYXDo9myLUX6usmwvN4h3yJqUnHe8ysAbxcllQkzY=; b=RXJG+UY6rMc/LoJeitx64+8WMAI7GKZewpjCymdnzuX7mIhPDAkkK6Q/EZeoIfMMGG 78LwHoCXyV9gI/JeAU/PTwNibk1Jo8mxuNq8c+qjcGCGCM1f8lPy0ZH5JAYoDyAZsOO5 CDfZ4c/jA6DMzEejiJTVfvT3ulTHrowPrhU6kNLPJFLWZf2/IivWc1RKoh9CY3aqxhuv QrCsfjNG6ooJz4eyMzgOvhPAqLo85JyDmRIHmcFMKswAJsUPBdswUPhuKjqxcO9zdUSF 9NvcJ01voiXJC4089Y0qXS18VU0wDnaMvdRsT8maoVLmn/nLabr3Dr3YmT6k7naHy7LD QVYQ== X-Gm-Message-State: AOAM5317OkG2HidPom4ICElQhkoQ1OU7bI59P6zdjyIrKbuAebOsy6Xj Hy4oS7I8TRpK+D4pKgG0AGy+VBu6930= X-Received: by 2002:a19:550e:: with SMTP id n14mr8387450lfe.141.1641821292582; Mon, 10 Jan 2022 05:28:12 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id p27sm1020847lfa.295.2022.01.10.05.28.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 05:28:12 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jan 2022 15:28:07 +0200 Message-Id: <20220110132807.26929-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4] 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: G9kM/+9BWBbU From: Jan Ekström This long-existing feature calculates subtitle durations by keeping it around until the following subtitle is decoded, and then utilizes the following subtitle's pts as the end point of the previous one. 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 0b00bb5b23..c21de6e2a5 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_SAMPLES_FFMPEG-$(call ALLYES, LAVFI_INDEV MOVIE_FILTER FILE_PROTOCOL \ + PIPE_PROTOCOL MPEGVIDEO_DEMUXER \ + MPEG2VIDEO_DECODER CCAPTION_DECODER \ + SUBRIP_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..0ede5c6b90 --- /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 +