From patchwork Mon Feb 21 11:30:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 34434 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp3299977nkx; Mon, 21 Feb 2022 03:29:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJw5nv0koxKl6cGHSfVG/rwQjW+Sg76bQYawW9zV5cDLhtTi/W0J/7isA8aJ0GiA14WlWeQO X-Received: by 2002:a17:906:9711:b0:6bd:181b:a5a4 with SMTP id k17-20020a170906971100b006bd181ba5a4mr15842982ejx.98.1645442945378; Mon, 21 Feb 2022 03:29:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645442945; cv=none; d=google.com; s=arc-20160816; b=bRxymXmaosGIB81z3q+jzxBp54nTfH9AZrKGigJKMFxEmjeSirWwnRet+n8BP72Dh0 zp6yXkWKFB4DKS5fMrzarVH5SMG5StQLZK9TFGdlOswAIzKgNee92j295XvwXORB83Ot cPLhrong8J5AxZM0VQ6nXoyrwP7x3wchWKeVm0dX1Cdu/2BwRgU+q+O3dMdJqex4hx3L XPmuFGQFz29YYCb1eMcDo2zJURWj7lW0MoM9vvn5tjGy4R3mBrloDWCQchern6OSLJy8 mBNKDNZwXI4rKoHVZXif5Vw9AsbSrp5c+eJgNzUySj+Vk3k5HwNy6NFsfD4mt3dW9uBS cI5g== 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=biR2tScLGkjucOnP0TxTSN4M8Mygny5jUHbHjOofj54=; b=aK545Y5Fr27eOH3PWEKm0dVWm+YVLI+rdoHx7gmCTQwwS2qAhe3H1sl2xi8bfWBuSI z7E2MMvPqB0tWyLD3gdae0QI5fTyxnQ23zFQ3UPz2MmznjiAlR4qDDefmEvwxiKpcbuB OBojhXnl5WGzrrm+NXgJEmkPTFXsTsmGy+b6Anw2xSLCoUIOzKMyrg+ouKznMNRg6PSD jQKfqEI09ggLQnX3dDrVvlHnc9csvv/VMO5Af7Jl6ZxYJ1XMWJQ6lwuNI+yJDq+V1NIE Jl81kKizHaVJkxFwTKko3TCUkOqZsS5UStpCjuA61H30D83MZs1B7VvTIw4avQXnrIJz uPDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=iMQh4IOL; 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 j26si8164482ejy.88.2022.02.21.03.29.05; Mon, 21 Feb 2022 03:29:05 -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=iMQh4IOL; 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 5232A68B109; Mon, 21 Feb 2022 13:29:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 493E868A774 for ; Mon, 21 Feb 2022 13:28:56 +0200 (EET) Received: by mail-ed1-f43.google.com with SMTP id cm8so19061332edb.3 for ; Mon, 21 Feb 2022 03:28:56 -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=Ab3Q8I8QNhmIEJPAYROdzMpfSZ/1rDUDUDIjrjj/xIM=; b=iMQh4IOL7AbTvhK+TQSnw9mQFEC4jTN72a0+5dw/EiSY68Ktz9XGQ8utGpiJeL4zzu wthUJvFE9a1F5uYJwWrbblRFGpwUDk1RNC/lKL/f+rd6gqKOlRPIA0rSQB6KM5q2bZSn 6zFFf/h5uutL6MDTn0zaTWbY9iJ/4rYAEakfmIJSeTqT5ZWfKBHClH0i86kByvNIH3O8 btSkJ0dlpOlyvyDH0eqCMI5yZvsf4WcCbVrmlJvX7fciNIGFd8F4heaAOougW2BUBDKc TA7vdjqSdR5hPgsR4+wQQu4sqDWrHCk+0N5MRklazJkC+Fp56iKaygGkiWYSV9/+sjOF M56w== 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=Ab3Q8I8QNhmIEJPAYROdzMpfSZ/1rDUDUDIjrjj/xIM=; b=lectgFEkrhN0IVeLjChfU5CdWokCrHYL8lm+uJLWj9Iyfvk0bQncERpn5birvF8P69 iK7yog7f3adLuUmOyHwSKs/v7YMr7Hpgq7rfFEHAI8aUm0DSwL/53GkiiZI8164/Yaqb SOIYtQkAW79L6n/OHgR43lut4qTDiyxgsnbTt3vQl/w+b1x+U4ilyb36QGgGo3NFpis6 WO7do+0q5dO3IVvG4lZjOJrXamCl9H0g6Jfy/pEL0Na6CFkG+VCgD+PekEzmyk7RT7bK MetkBKHMhPXdCoPfkgDH4Cu0SsOeGG0DFTcJJVsMGMHUU4RwcT5W7EekunvxL26qM1PS IxnA== X-Gm-Message-State: AOAM532BAGFf2PORaEkC1lK1M/rGqLU6vVPnbePBtzbYedMun50oiZvl iDBnebQQdyH+K0pdRYHCerYgbGlVd/o= X-Received: by 2002:a05:6402:b9c:b0:410:d469:d73d with SMTP id cf28-20020a0564020b9c00b00410d469d73dmr20644579edb.78.1645442935438; Mon, 21 Feb 2022 03:28:55 -0800 (PST) Received: from localhost.localdomain ([95.168.121.13]) by smtp.gmail.com with ESMTPSA id a6sm533272edu.22.2022.02.21.03.28.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Feb 2022 03:28:55 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Feb 2022 12:30:25 +0100 Message-Id: <20220221113025.421154-1-onemda@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mov: stop ignoring subtitle packets durations 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: xFAGBzRvmuSA Fixes #7855 Signed-off-by: Paul B Mahol --- libavformat/mov.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 5e26267810..d980996086 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4359,7 +4359,8 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_freep(&sc->chunk_offsets); av_freep(&sc->sample_sizes); av_freep(&sc->keyframes); - av_freep(&sc->stts_data); + if (st->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE) + av_freep(&sc->stts_data); av_freep(&sc->stps_data); av_freep(&sc->elst_data); av_freep(&sc->rap_group); @@ -8323,6 +8324,11 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->flags |= sample->flags & AVINDEX_KEYFRAME ? AV_PKT_FLAG_KEY : 0; pkt->pos = sample->pos; + if (sc->stts_data && st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) { + if (sc->current_index <= sc->stts_count && sc->current_index > 0) + pkt->duration = sc->stts_data[sc->current_index - 1].duration; + } + /* Multiple stsd handling. */ if (sc->stsc_data) { /* Keep track of the stsc index for the given sample, then check