From patchwork Sun Jan 1 12:24:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 2007 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp3581643vsb; Sun, 1 Jan 2017 04:31:23 -0800 (PST) X-Received: by 10.28.109.2 with SMTP id i2mr46288565wmc.41.1483273883527; Sun, 01 Jan 2017 04:31:23 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f187si65865988wma.87.2017.01.01.04.31.22; Sun, 01 Jan 2017 04:31:23 -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; 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 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 563586897E6; Sun, 1 Jan 2017 14:31:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wj0-f178.google.com (mail-wj0-f178.google.com [209.85.210.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9588B680942 for ; Sun, 1 Jan 2017 14:31:09 +0200 (EET) Received: by mail-wj0-f178.google.com with SMTP id v7so408709600wjy.2 for ; Sun, 01 Jan 2017 04:31:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=6wzGeqERGKw4z52yQL74tp5EeY8hntXoohot3a57edw=; b=aLKCrnk3Vo13ottpo+x2R3HKEihT2bMUZPe/l7jRUNCz7tJ4xiv4hP0LNV6PpIfQdT gkjPm5By9bBG3UC95KSfC2Phbj0gjzqTUJ4+YAmZ3IJLpjynkc9jBS6C8p/Ci3wpHZU7 a9lyg8kRwvhCeQav7PGV9LcFHmbSuxTg77QCA0wlBED9Yo1fD5UAzq2RblyG36G0GM1D wq8k1RKlqef2ShlGTskqC+5ycQRO7qCJC0Olvan9JNWzT1i+9/Oj9z9Dw4/WiLHZ6Cxd qT9iruRr/hiq2eZx0nIwzAGtCoLWHM/Da3LQ6azMu+2i7yohGrMOqLpiIgjd+Te4XliN RniA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=6wzGeqERGKw4z52yQL74tp5EeY8hntXoohot3a57edw=; b=eMoWycYqwdnokuihRFnmPdt2ahqdEPWrP3q/jg9b8lH+0LlhHBXbNjAqN2aUqY5rTn 2mXzYn+aGSkgADlFxOyO+3fkbOW8JoO96Bey3Pn9jfcLrcJ0ZME1RigibU2N6LeAF5VE GgLiKXFK7e1rlxFmi/WrZQzfhRPIlaG5AJQKfT5Z268GBDRFSNZNObdsVvQf2unH/8vp j7JZZhvxT3ynKB9Ie+9u/dze7nEBV432+iZyaSYnjjbUO4Hi7zXMUr1kwLRWTw+WbgNu SAWW3KoKT/6tbRYkriEvziN+WfiHGxl1mpDohrsgZJgAd6QLsRl9rGs5+ahU7HDlN2a0 IeLw== X-Gm-Message-State: AIkVDXKbmvPCegZpe8rtDfp1P7HVHgiYW7/n0m+WKPO0QaspsI2O7dy32b24lYBSMFETDog+sT3zFcGWTu91yw== X-Received: by 10.194.136.166 with SMTP id qb6mr44913187wjb.42.1483273462276; Sun, 01 Jan 2017 04:24:22 -0800 (PST) MIME-Version: 1.0 Received: by 10.194.171.106 with HTTP; Sun, 1 Jan 2017 04:24:21 -0800 (PST) In-Reply-To: <991d8f90-33fd-1cf8-6ed0-9ce939873c29@vivanet.hu> References: <0e75dacf-46ad-5d16-5b4e-e6732fb4d91f@vivanet.hu> <991d8f90-33fd-1cf8-6ed0-9ce939873c29@vivanet.hu> From: Steven Liu Date: Sun, 1 Jan 2017 20:24:21 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH] avformat/hlsenc: Duplicated segment filenames and use_localtime_mkdir 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 2017-01-01 20:14 GMT+08:00 Bodecs Bela : > > > 2017.01.01. 12:57 keltezéssel, Steven Liu írta: > >> 2017-01-01 19:40 GMT+08:00 Bodecs Bela : >> >> Dear All, >>> >>> current implementation of finding duplicated segment filenames may fail >>> if >>> use_localtime_mkdir and use_localtime are in effect and segment_filename >>> option expression contains subdirectories with date/time specifiers in >>> them. >>> This patch fixes this false behaviour. >>> >>> >>> thank you, >>> >>> Bela >>> >>> >>> _______________________________________________ >>> ffmpeg-devel mailing list >>> ffmpeg-devel@ffmpeg.org >>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>> >>> >>> +static HLSSegment *find_segment_by_filename(HLSSegment *segment, const >> char *filename) >> +{ >> + while (segment) { >> + if (!strcmp(segment->filename,filename)) >> + return segment; >> + segment = segment->next; >> + } >> + return (HLSSegment *) NULL; >> +} >> + >> use av_strcasecmp will better。 >> > yes, I have changed it. > > _______________________________________________ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >> > > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > --- libavformat/hlsenc.c | 50 ++++++++++++++------------------------------------ 1 file changed, 14 insertions(+), 36 deletions(-) double duration, int64_t pos, int64_t size) @@ -383,6 +393,10 @@ 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, en->filename)) { + av_log(hls, AV_LOG_WARNING, "Duplicated segment filename detected: %s\n", filename); + } av_strlcpy(en->filename, filename, sizeof(en->filename)); if(hls->has_subtitle) @@ -659,38 +673,6 @@ fail: return ret; } -static HLSSegment *find_segment_by_filename(HLSSegment *segment, const char *filename) -{ - /* filename may contain rel/abs path, but segments store only basename */ - char *p = NULL, *dirname = NULL, *path = NULL; - int path_size; - HLSSegment *ret_segment = NULL; - dirname = av_strdup(filename); - if (!dirname) - return NULL; - p = (char *)av_basename(dirname); // av_dirname would return . in case of no dir - *p = '\0'; // maybe empty - - while (segment) { - path_size = strlen(dirname) + strlen(segment->filename) + 1; - path = av_malloc(path_size); - if (!path) - goto end; - av_strlcpy(path, dirname, path_size); - av_strlcat(path, segment->filename, path_size); - if (!strcmp(path,filename)) { - ret_segment = segment; - av_free(path); - goto end; - } - av_free(path); - segment = segment->next; - } -end: - av_free(dirname); - return ret_segment; -} - static int hls_start(AVFormatContext *s) { HLSContext *c = s->priv_data; @@ -736,10 +718,6 @@ static int hls_start(AVFormatContext *s) } av_free(filename); } - if (find_segment_by_filename(c->segments, oc->filename) - || find_segment_by_filename(c->old_segments, oc->filename)) { - av_log(c, AV_LOG_WARNING, "Duplicated segment filename detected: %s\n", oc->filename); - } if (c->use_localtime_mkdir) { const char *dir; char *fn_copy = av_strdup(oc->filename); Signed-off-by: Bela Bodecs diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 57fc9c1..591ab73 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -367,6 +367,16 @@ static int hls_mux_init(AVFormatContext *s) return 0; } +static HLSSegment *find_segment_by_filename(HLSSegment *segment, const char *filename) +{ + while (segment) { + if (!av_strcasecmp(segment->filename,filename)) + return segment; + segment = segment->next; + } + return (HLSSegment *) NULL; +} + /* Create a new segment and append it to the segment list */ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls,