From patchwork Wed Oct 25 23:54:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 5694 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp192538jah; Wed, 25 Oct 2017 16:55:32 -0700 (PDT) X-Google-Smtp-Source: ABhQp+THTrLp4q4C97gKC2nLhVUMERRac5NFVc3zOOmlqtqqSTWbqKElg50cq6UvLJv3z93lOvOw X-Received: by 10.223.139.221 with SMTP id w29mr3496181wra.243.1508975731936; Wed, 25 Oct 2017 16:55:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508975731; cv=none; d=google.com; s=arc-20160816; b=ieYVeZcEFpAvcrxjpTVbeXVu9wSDZyoqcux5FIGKKaVQ900TyrqaskE25fXPfUaTGK mLVlA6hwkukIwl1TVzmgH1zuf2NkvT35OI/VwcSSh8xA2D9ZCwFf5kbfYMzYpFezwolF 1BmPIPcI2ObzKEKeZShOwOEvD0df14gIqGvsJSWzDdact2WNo2TefeYVc3QqDhBht8QD pXrSgO9ivfQPB/Ylwom/KA2XsNEE2KktYCoxehQRjzxRVtQx/T3JC2l5tEehAsJY4Zo/ 2tD0ze3O69olmc8dwEp1NdWp457MV7ggAa6W/qLDGajRNAGAIJr8asYps912pIZivu6f 0OeQ== 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 :delivered-to:arc-authentication-results; bh=nE7HKWqV9vPHv1AQumx+9c37d3y8hXm67hECNJoWoYs=; b=Pau9HiabcYsBvMA/iOI+6ZeAvtqTtEglTh6oL8eRVRjH9HAvVhqCs7UpxfKlDY3Bx2 dxUYLxLXsQpr+CiN4Y3dldF13vnhD0SkeCHsUn3LrqG5qYe3Lti8YpsCEoxkpuRLhYiB nqleQhZa5k2uqzvwy6ILK+pWcVhEp4bKt4loTdQb5y6AykCWC/nJjw9cjXt4IS/I4g9o MDY0yprGlixCOMrKcG01Z79TA2OD7NMPGB9MX8jHqty3QhelV0Cj7EPbKopu9NGmzhCu A95IRfHcXmqRpFJW/EtYfhz12u7cZMGAUs7637hDT2vrQwibujy36hpPRhr3rsPpwRPt XmFA== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g25si2963152wrb.544.2017.10.25.16.55.31; Wed, 25 Oct 2017 16:55:31 -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 345E068A55B; Thu, 26 Oct 2017 02:55:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgau1.qq.com (smtpbgau1.qq.com [54.206.16.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 174C368A555 for ; Thu, 26 Oct 2017 02:55:11 +0300 (EEST) X-QQ-mid: bizesmtp15t1508975693term1ng4 Received: from localhost (unknown [114.245.24.93]) by esmtp4.qq.com (ESMTP) with id ; Thu, 26 Oct 2017 07:54:52 +0800 (CST) X-QQ-SSF: 01100000004000F0FI60B00A0000000 X-QQ-FEAT: YSSoAXAEBlFezR2RmbnMR6XJ4qd4v9dIoWLF83I0SmK/PRoKtOsqWY5p6KDHF wlDomEugLL9mw9YgRlRfn+Z03q8hUsAl6mXEsP7wE9lIBK5pGYXpEKg+IgsazMr28H2lL3T +EZS/u0agxVxQemdJnGCj6oCxK4UYegWIyh/J3pglexWdXtkSf/f2Q2kgZXd15W6d1IGRHV oCXRGN6fsxk4f0quFogyldyot6g542JLME0bnT8o3q/hu/J/gO5YXPsEk7iWObnPpAhQGwL 1KDBJYQFHbblLngbrJ0GXT4gg= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Oct 2017 07:54:49 +0800 Message-Id: <20171025235449.35684-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.11.0 (Apple Git-81) X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign4 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/hlsenc: fix missing first segment bug in fmp4 mode 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" fix ticket id: #6776 fix code logic error, need not check first segment. Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 55ce800c5a..caced6a3dd 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1080,15 +1080,16 @@ static int hls_window(AVFormatContext *s, int last) avio_printf(out, ",BYTERANGE=\"%"PRId64"@%"PRId64"\"", en->size, en->pos); } avio_printf(out, "\n"); - } else { - if (hls->flags & HLS_ROUND_DURATIONS) - avio_printf(out, "#EXTINF:%ld,\n", lrint(en->duration)); - else - avio_printf(out, "#EXTINF:%f,\n", en->duration); - if (byterange_mode) - avio_printf(out, "#EXT-X-BYTERANGE:%"PRId64"@%"PRId64"\n", - en->size, en->pos); } + + if (hls->flags & HLS_ROUND_DURATIONS) + avio_printf(out, "#EXTINF:%ld,\n", lrint(en->duration)); + else + avio_printf(out, "#EXTINF:%f,\n", en->duration); + if (byterange_mode) + avio_printf(out, "#EXT-X-BYTERANGE:%"PRId64"@%"PRId64"\n", + en->size, en->pos); + if (hls->flags & HLS_PROGRAM_DATE_TIME) { time_t tt, wrongsecs; int milli; @@ -1113,11 +1114,10 @@ static int hls_window(AVFormatContext *s, int last) avio_printf(out, "#EXT-X-PROGRAM-DATE-TIME:%s.%03d%s\n", buf0, milli, buf1); prog_date_time += en->duration; } - if (!((hls->segment_type == SEGMENT_TYPE_FMP4) && (en == hls->segments))) { - if (hls->baseurl) - avio_printf(out, "%s", hls->baseurl); - avio_printf(out, "%s\n", en->filename); - } + + if (hls->baseurl) + avio_printf(out, "%s", hls->baseurl); + avio_printf(out, "%s\n", en->filename); } if (last && (hls->flags & HLS_OMIT_ENDLIST)==0)