From patchwork Fri Jun 16 02:57:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 3997 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp1082521vsw; Thu, 15 Jun 2017 19:59:52 -0700 (PDT) X-Received: by 10.28.158.206 with SMTP id h197mr4435147wme.110.1497581992627; Thu, 15 Jun 2017 19:59:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497581992; cv=none; d=google.com; s=arc-20160816; b=glscwa2kIFLB0byenAr5W67NSH0xglQAp3d2O4XZN9QsyVfJxB9Uzx5SCFIZy9MxkV niun2XjSDIQmZZvo/L252Cx0XLT+k+CVaBP1n4HICwuLSczZjJglHF+Ey3r26jfS0tcd AynsrAm6qFwA405Ovwxpyw+V6K8RXLIf2XJEQpkMLmWo6fy1Z0wujPpXw5/ZflCisq3B UNdMjDejbLJCFw/kxb5IXXoGzbPb/o6iqJwoVf0msdzO4495MTbRFVmoOyxt75wMgY1N yCNR2gp4RBQdIxWY/K59iF3DGafsPJ4NteKmY6AciOmPvdxLxU3KZZgozMXjC3ni33UT OgLA== 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:message-id:date:to:from:delivered-to :arc-authentication-results; bh=07ChHMF1o/dkHaXYdaSjS6DPW4MinVWAbZ7v2H+L3/Y=; b=SE2U2bbyXANcI7vfcMOGUNDnYau6zF0GPdmba9nQUQQ8oR8GDAT1MtUn06V5LcTICt Tm28ehydAKQ6X+xzWkspJ3mVJcLW9Q16RR+BBekNf6vMa0Jh86Y0EpajuKVGCGhrVbUv JSZXchCmUBDfT3gJKOnDgtKbYiv3y8tG9D4Hty/N758e89n8H3HptftWwUmMLPIp7aXf 5OrEiXASNvli2XDEZK8zPxdYtu+IVupi2hcG+Kll9b1yYxKGcV2YJ4gO+lhf4Zbxhgo3 /S6c2M3BHicvNo7ol1sFrFT+NEuzjR4zqu6hg9UFWprEAJU3VbOmcnN9vqkdW0jFsjOX Z4QA== 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 y17si865617wrc.246.2017.06.15.19.59.51; Thu, 15 Jun 2017 19:59:52 -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 4C58C689ED0; Fri, 16 Jun 2017 05:59:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg320.qq.com (SMTPBG19.QQ.COM [183.60.61.236]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BED63689EB1 for ; Fri, 16 Jun 2017 05:59:38 +0300 (EEST) X-QQ-mid: bizesmtp5t1497581868td2g2yn55 Received: from localhost (unknown [114.255.44.132]) by esmtp4.qq.com (ESMTP) with id ; Fri, 16 Jun 2017 10:57:47 +0800 (CST) X-QQ-SSF: 01100000002000F0FG50000A0000000 X-QQ-FEAT: Tp2hW+Mew+ef3ggldwX4lmHmcAp8mwcU//ykSya48kBu9OYKd0dpyHcTYy5wX MXQ3bKJOMmr0EtgO5T/2KoRRnMl52mFUGm7tXc7W73Gc+3F0qbWhkMN+O9tbbBQMVKRp7Dc 8fMhw5TDbw5PVbTLXp94TCY9ArQY1Kf6yAawtV+ifUU7oTMZxsQotOjGSgt7uqIot70CE43 J9k+tKzpo3pPyVZSsrVZtODkdSdg1aM90QakFVT0M9gqe0XoKB2040QSnfxhCdNFTvQchWU 2AjA== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Jun 2017 10:57:40 +0800 Message-Id: <20170616025740.28585-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.13.0.rc2 X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: donnot show duplicate segment warning at byterange 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" When the hlsenc at BYTERANGE mode, it should not show the warning message: "Duplicated segment filename detected:" Reported-by: Marco Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 7ed121a..40143c8 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -722,6 +722,7 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, double { HLSSegment *en = av_malloc(sizeof(*en)); const char *filename; + int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0); int ret; if (!en) @@ -737,8 +738,8 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, double if (hls->use_localtime_mkdir) { filename = hls->avf->filename; } - if (find_segment_by_filename(hls->segments, filename) - || find_segment_by_filename(hls->old_segments, filename)) { + if ((find_segment_by_filename(hls->segments, filename) || find_segment_by_filename(hls->old_segments, filename)) + && !byterange_mode) { av_log(hls, AV_LOG_WARNING, "Duplicated segment filename detected: %s\n", filename); } av_strlcpy(en->filename, filename, sizeof(en->filename));