From patchwork Mon Mar 13 09:12:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 2915 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp1078724vsy; Mon, 13 Mar 2017 02:13:25 -0700 (PDT) X-Received: by 10.28.46.73 with SMTP id u70mr8975184wmu.54.1489396405062; Mon, 13 Mar 2017 02:13:25 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p72si10094115wmb.59.2017.03.13.02.13.24; Mon, 13 Mar 2017 02:13:25 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1EA54689D2E; Mon, 13 Mar 2017 11:13:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgbr2.qq.com (smtpbgbr2.qq.com [54.207.22.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 535F5689C54 for ; Mon, 13 Mar 2017 11:12:58 +0200 (EET) X-QQ-mid: bizesmtp14t1489396369t5vm5h6h Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Mon, 13 Mar 2017 17:12:48 +0800 (CST) X-QQ-SSF: 01100000000000F0F930 X-QQ-FEAT: CPmoSFXLZ/Ra7Jg0yyIU0viLlKudGXAoRyMdkWnbfY0Fpk2zkqMZwK6jqVGXv /PV0xfGi95DZsIjXKUGiFXxmtsOjXg+0c7aaokLL5hT2XEi1l99dnAP9Yih+POcMWaLcZU8 GkNsGSrJy0N+U7dHbSsZDc6O/i6GCspGYcG80zUmiXQ5OJxwKCYOLyn91weJIxOUmitBwL0 CokvQHEqp8W0NCnPO1WorVZ6CYz77I4VtiBnwQxV+X6Om3QJOcAgBrCOe/jtRdjE= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Mar 2017 17:12:47 +0800 Message-Id: <20170313091247.19031-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: fix duration wrong when no pkt duration 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 Cc: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" when cannot get pkt duration, hlsenc segments duration will be set to 0, this patch can fix it. Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 5df2514..d6f0631 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1354,7 +1354,12 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) * st->time_base.num / st->time_base.den; hls->dpp = (double)(pkt->duration) * st->time_base.num / st->time_base.den; } else { - hls->duration += (double)(pkt->duration) * st->time_base.num / st->time_base.den; + if (pkt->duration) { + hls->duration += (double)(pkt->duration) * st->time_base.num / st->time_base.den; + } else { + av_log(s, AV_LOG_WARNING, "pkt->duration = 0, maybe the hls segment duration will not precise\n"); + hls->duration = (double)(pkt->pts - hls->end_pts) * st->time_base.num / st->time_base.den; + } } }