From patchwork Mon Nov 27 05:03:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jeyapal, Karthick" X-Patchwork-Id: 6395 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1237601jah; Sun, 26 Nov 2017 21:04:24 -0800 (PST) X-Google-Smtp-Source: AGs4zMaKmzS6CUFfFV1ubkFvkSiPVY8UsOOl/yw0LQs4pS5BqnH25ZKgCfgI8HnNFqKfnrAv2SIo X-Received: by 10.223.161.222 with SMTP id v30mr27210011wrv.191.1511759064709; Sun, 26 Nov 2017 21:04:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511759064; cv=none; d=google.com; s=arc-20160816; b=slppzmPG7ePftbVX32+2J4FAoVRHkcbhItPWoMR6g8OQrH8FpzQM7wsDeaputriem9 yzt30OvhS2pZtwXn2THVBqgd0ProkvV6sS4wGM87pEZb8g3Sxbs47cvFps49w8LWrsRs N2ySA+xQD4q/WIYxmmpUVk2qXZuXQtxN88bO3Zpa1f9d98XciaBNemEoe02HgX3T/lID Acpw73/Gt7zUpvgS+Hg0cyTtAFoTrCL9WA1B2NhNOceq7kaGwlY71zvsyRIFycdHgxOc MKtO15PsJMFx2mtDNc8puGfdO0hgArnPNFfEQIlS0kemgbe1sRwJfKLNNqu3HMxL6w/8 S0vA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=3qf0A4vwI9XEpy4C5b6CErP0NBG00SAfvID00AZSvn0=; b=Dw5E/R0SWVIOF/TWMKl5GzttbZ5hHvC4HOqwM7Wr3rjmlgitOerc2m2YZktHptafov nLYCDfHByJ98Ttx89SVflvNu5zDyCmG/ODhOK2Zx3qX+nbZu0N36vkRaIkDOySYREZzg Uinch5CkA88v4qeq6YD3W+N7kM9zVhCUBbFMe3lp5I+NUob3WXWQU9XKib1EVvjmtXXT /1T9xj/XfFy/xcyDnn+P/jA/yta6yNdpf5ssZugsdSx1KFS1kgioXkDifpr9GFUAzlSk YJstQbat0ebKp6s3Gt0N+0rgKcIEYZn8VDAviDQ04YOUJKE7tJp+pV0PQbUpRZk01g8e fhjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=M0ptlxAQ; 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=QUARANTINE sp=NONE dis=NONE) header.from=akamai.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d16si16424078wrd.331.2017.11.26.21.04.24; Sun, 26 Nov 2017 21:04: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=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=M0ptlxAQ; 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=QUARANTINE sp=NONE dis=NONE) header.from=akamai.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BD718689ED5; Mon, 27 Nov 2017 07:04:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a2i831.smtp2go.com (a2i831.smtp2go.com [103.47.207.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 419A2689891 for ; Mon, 27 Nov 2017 07:04:13 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1511759960; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=5+26DEAKDibe3pDX6jmoi0TKbdUJRUBn3/Jtr5+Q634=; b=M0ptlxAQ CkPVI+wpQCjljCt6SbLqxpA3Hm+3TpUp7SoYBXinyXbIdYWkYwAYilc3E2TRsUjPW/V4MZLu4LZ3f UemhFj1hEznT5k7Ix5BXoTnmdaAn7yMs9/r/2Q7+TGowXU+AmMCGFnmVlZzG4lCHFnfSQ2+p9j5O0 +uNpifoMjT3h5Q1qWAYciXS4gMNeD0XrQz0bKhUGXM9/RKK5ZDsn4m9FZtVRF7QUWhmvr2pm88V6s y+dp8JdR0cP4unela52D6dbM1jflUWoibBXh24ucyoEvklLXKsrnU3JrGkIFasbSrO4sXM/cRaeqQ hasIXfq2e6EZRd7jC0FmAhhqyw==; From: Karthick J To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Nov 2017 10:33:58 +0530 Message-Id: <1511759038-31312-1-git-send-email-kjeyapal@akamai.com> X-Mailer: git-send-email 1.9.1 X-Smtpcorp-Track: 1-JUaTNmF9ErGc.G9zm-B52t Feedback-ID: 337386m:337386asVRLGB:337386s_PZXopsAJ:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: Fixed initial setting for end_pts 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: Karthick J MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This patch fixes Bug #6868 Sometimes end_pts is getting initialized to audio stream's first pts, while the duration is calculated based on video stream's pts. In this patch the end_pts is initialized with the correct stream's first pts. --- libavformat/hlsenc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 30ccf73..6997a5c 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1737,6 +1737,7 @@ static int hls_write_header(AVFormatContext *s) vs->sequence = hls->start_sequence; hls->recording_time = (hls->init_time ? hls->init_time : hls->time) * AV_TIME_BASE; vs->start_pts = AV_NOPTS_VALUE; + vs->end_pts = AV_NOPTS_VALUE; vs->current_segment_final_filename_fmt[0] = '\0'; if (hls->flags & HLS_SPLIT_BY_TIME && hls->flags & HLS_INDEPENDENT_SEGMENTS) { @@ -2111,7 +2112,6 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) if (vs->start_pts == AV_NOPTS_VALUE) { vs->start_pts = pkt->pts; - vs->end_pts = pkt->pts; } if (vs->has_video) { @@ -2123,6 +2123,8 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) is_ref_pkt = can_split = 0; if (is_ref_pkt) { + if (vs->end_pts == AV_NOPTS_VALUE) + vs->end_pts = pkt->pts; if (vs->new_start) { vs->new_start = 0; vs->duration = (double)(pkt->pts - vs->end_pts)