From patchwork Tue Oct 8 01:34:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 15550 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0B68C449217 for ; Tue, 8 Oct 2019 04:35:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D35FD687FEE; Tue, 8 Oct 2019 04:34:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 25E56680371 for ; Tue, 8 Oct 2019 04:34:53 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id x10so9313675pgi.5 for ; Mon, 07 Oct 2019 18:34:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=LdsvozOz0tIpkXKaSfl2X59K4kDZJMA7E5Xk2MeY9dY=; b=PflsEzxuVziZ7so3wi9yfV4d6LW0ct9X/kgIBGnSD+zlT1p1c9Zh9jpFtozZCPR1s5 DrbrRzxci6RB8BY6FLBlMz0zpsErYkvBsjoi1w4pElOp6oSM3DvaAOEbThgNW9ZLYVuX 0PUl6kWC20js3qwu8JawAKDFCWPT5RDz0Q040kokKCMor8qyZqZuZh2njq9Z5sKremu+ no9+Hjhhd4bLWah7NQb7oOTBC0/2deaCl/Q5ASz5yVVHXDw/KLATs+F2ihlSqVi3EPhc GWPlArYBfkR6oQkAw0yeq1NmVINXYRwxDiNrqXZtxTDj6j+LP1WQmru+R2+7pFXVbMYx nZFw== 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; bh=LdsvozOz0tIpkXKaSfl2X59K4kDZJMA7E5Xk2MeY9dY=; b=h1rVXzInLYGXtPuB9ZhvruuUn/JbRwy11+f8NhfkK0cbcxGUNSCSAiz+ohYMergRdu htwhr9WoNzYXUJs41HmmRXSq3kcUFDQkKFXAjQXZ8nG7qh7BgY5bxfda3831Bt1nFyfH pqiHvOh+uhXz9WYFEBcSou7w2ePqu9rTd0+1/CAqwzgsYprovvnoMwIF/chzwmAe1zLg 3raXoi8DTj3unEeOH+RpUHo+YVRw8GyTRpQ0kY93r32PABIOwl9IVhPUN8N8py7peMMd pa5NjqmHkapDOrd930eydAvhPQmtUcG9hMhs9d9hRWy+BhHFpTZpcSbzwsvEDJEly0o6 rgVQ== X-Gm-Message-State: APjAAAVxGz/oa8uBOoynN+mX4BMXiH4wp41Guh1ZRv6YToaAnjqaVkHS U8IozFmQIkEcrhroeeA8xvy20lD4Eng= X-Google-Smtp-Source: APXvYqy69k7UKHXt+7ZjExyf+ejJO1Atvc2YoKlcPXTIQglpOlFL1BQPvB1X7D+GE3UimU7WyEsO+Q== X-Received: by 2002:a17:90a:b003:: with SMTP id x3mr2581792pjq.101.1570498490385; Mon, 07 Oct 2019 18:34:50 -0700 (PDT) Received: from jun-ubuntu.corp.microsoft.com ([2001:4898:80e8:1:d3fb:772c:132c:9591]) by smtp.googlemail.com with ESMTPSA id d19sm625975pjz.5.2019.10.07.18.34.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 18:34:49 -0700 (PDT) From: Jun Li To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2019 18:34:43 -0700 Message-Id: <20191008013443.8404-1-junli1026@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v4] avformat/movenc: split empty text sample when duration overflow X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fix #7637 One empty/end sample is created and inserted between two caption lines when there is a gap. This patch is to split the sample into multiple ones when its duration is too long (>= INT_MAX) Signed-off-by: Jun Li --- libavformat/movenc.c | 26 ++++++++++++++----- tests/fate/subtitles.mak | 6 +++++ tests/ref/fate/binsub-movtextenc-long-dur | 1 + .../fate/binsub-movtextenc-long-dur-timebase | 1 + 4 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 tests/ref/fate/binsub-movtextenc-long-dur create mode 100644 tests/ref/fate/binsub-movtextenc-long-dur-timebase diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 715bec1c2f..5dc2a19c3c 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -5750,7 +5750,8 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt) * * 2) For each subtitle track, check if the current packet's * dts is past the duration of the last subtitle sample. If - * so, we now need to write an end sample for that subtitle. + * so, we now need to write one or multiple end samples for + * that subtitle. * * This must be done conditionally to allow for subtitles that * immediately replace each other, in which case an end sample @@ -5764,11 +5765,24 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt) int ret; if (trk->par->codec_id == AV_CODEC_ID_MOV_TEXT && - trk->track_duration < pkt->dts && - (trk->entry == 0 || !trk->last_sample_is_subtitle_end)) { - ret = mov_write_subtitle_end_packet(s, i, trk->track_duration); - if (ret < 0) return ret; - trk->last_sample_is_subtitle_end = 1; + trk->track_duration < pkt->dts) { + int max_duration = INT_MAX - 1; + if (trk->entry == 0 || !trk->last_sample_is_subtitle_end) { + ret = mov_write_subtitle_end_packet(s, i, trk->track_duration); + if (ret < 0) + return ret; + trk->last_sample_is_subtitle_end = 1; + } + if (trk->last_sample_is_subtitle_end && + pkt->dts - trk->track_duration > max_duration) { + int64_t dts = trk->track_duration; + while(pkt->dts - dts > max_duration) { + dts += max_duration; + ret = mov_write_subtitle_end_packet(s, i, dts); + if (ret < 0) + return ret; + } + } } } diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index 0042902161..4c2b34c431 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -34,6 +34,12 @@ fate-sub-movtext: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MovText_capabilit FATE_SUBTITLES-$(call ENCDEC, MOVTEXT, MOV) += fate-binsub-movtextenc fate-binsub-movtextenc: CMD = md5 -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -map 0 -scodec mov_text -f mp4 -flags +bitexact -fflags +bitexact -movflags frag_keyframe+empty_moov +FATE_SUBTITLES-$(call ENCDEC, MOVTEXT, MOV) += fate-binsub-movtextenc-long-dur +fate-binsub-movtextenc-long-dur: CMD = md5 -i $(TARGET_SAMPLES)/sub/WebVTT_movtext_long_dur.vtt -map 0 -scodec mov_text -f mp4 -flags +bitexact -fflags +bitexact -movflags frag_keyframe+empty_moov + +FATE_SUBTITLES-$(call ENCDEC, MOVTEXT, MOV) += fate-binsub-movtextenc-long-dur-timebase +fate-binsub-movtextenc-long-dur-timebase: CMD = md5 -i $(TARGET_SAMPLES)/sub/WebVTT_movtext_long_dur.vtt -map 0 -scodec mov_text -time_base 1000 -f mp4 -flags +bitexact -fflags +bitexact -movflags frag_keyframe+empty_moov + FATE_SUBTITLES_ASS-$(call DEMDEC, MPL2, MPL2) += fate-sub-mpl2 fate-sub-mpl2: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MPL2_capability_tester.txt diff --git a/tests/ref/fate/binsub-movtextenc-long-dur b/tests/ref/fate/binsub-movtextenc-long-dur new file mode 100644 index 0000000000..eb8a3f8fc7 --- /dev/null +++ b/tests/ref/fate/binsub-movtextenc-long-dur @@ -0,0 +1 @@ +7f78c11bb4a6b16335540ef31ba10219 diff --git a/tests/ref/fate/binsub-movtextenc-long-dur-timebase b/tests/ref/fate/binsub-movtextenc-long-dur-timebase new file mode 100644 index 0000000000..185dcc0aab --- /dev/null +++ b/tests/ref/fate/binsub-movtextenc-long-dur-timebase @@ -0,0 +1 @@ +349d78698cc1226d33d4e6699dbf46d9