From patchwork Tue Dec 26 09:53:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dixit, Vishwanath" X-Patchwork-Id: 6979 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp6651833jad; Tue, 26 Dec 2017 01:53:49 -0800 (PST) X-Google-Smtp-Source: ACJfBos7IIarxdDUncomwzCIkYhzG+9QJS2DI+FX1ZeLyRKwqUKQRVQv4cthGM6WQvL3RdZdFmez X-Received: by 10.223.189.13 with SMTP id j13mr23661569wrh.168.1514282029304; Tue, 26 Dec 2017 01:53:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514282029; cv=none; d=google.com; s=arc-20160816; b=yLhOqF7bOmPahQzxSy7lvK8BVNCWzgrgubmc1ks0d3RhdXbxxFffa98e3DhYmw+oEd tikMSEaPw7eTgWAzuJfG9EPbrTqUzxB9g/e6+c92FHPsu/jVQstzEiEETGn1UDOQhaTy XqqA3+uaLj0aJI00Td0LdXlKkrixBRqBP4r3f/tnEs3/bUT0GwJgCk7OCqYytX2HY9bA FJaWTH5tsO8eIKSaWOQ5jVgc4zMNrL7XlMGxXP8DE/mx+5oQnUTfbKd2p/NeeaDzmybk qTWF/1Rb7yOzApfc5SXW5Bd+CytgnHFNEkVqvr3jsgHsUuYwGoqmN7ZCXJ3CJTeCQ7md 36Kg== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=2q97Vgd0ZYUqLxAoDOzT8UZmqM/o3/60IcWJ6Utq0V8=; b=rvBi/MJRtgCABdSumJ4PmeoTmJOz3x+314TlHSEI7vlOKBZh6RSbUxVdXlldSh5MHp V/GIsSmug0oga52hRSwbKA6NGST0pM2ntWg4XAnNd/x/TppY3g0ncIswQW8ILcPoHZvD 3+RPuhJP+rGbjdpMSt3gBK2Z0fWVx5RI5xfQ6CxnRAP3YKdq+CVckNkZiH4K1hTH/XUi pgDHSS0ESmVpD+CsQfKxVbsNHteDOXYS275fkTHgs1yIBhfgqh3uH+BxZa04imLeRXZi ZrsMu/M9ihATuSmRgQXvnib4oxfV0GQvwgxvc0Lwp5Uy0A+5fthKpj7H5L4x886eog6M bIaA== 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=e2/6LG03; 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 o135si11495889wmd.101.2017.12.26.01.53.48; Tue, 26 Dec 2017 01:53:49 -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=e2/6LG03; 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 2C373680ACF; Tue, 26 Dec 2017 11:53:34 +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 7A8B16806CB for ; Tue, 26 Dec 2017 11:53:27 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1514282926; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=at/w/vKmvVXkszgukQmhaSBxXdKvjbSgdpWxFqohgm0=; b=e2/6LG03 IG7Y5c0Dlnyarjou/A+es69yHcLS9LUya3B2wfEEeT1PWLmEb4onbWBqKnXA1iRQMwzrXcHO357e5 yN5FiIS8SqwrF7JW2hXlEg3A1xNPAsOq3H6398ncrPCbPHOUWVLrfcKDvy8d3iz7QgDPcaMxoYSyd cBP8ShmQRa2C7TYUYFzugO05e4wUxKQe1R1TUh8/c9qaGx1KOq79L1F3V2Tkf+DcIwN9cZ8Irjvek ggr3gAPLwqiJYKdhQJdypSp7r5QDRHVbaG+ork2EyhXkMQVYlrwtCk+JxfhIe/uZ03hkc1xNTm/QM qSHM2yZwoKJvgmfRnuSDxsBiCA==; From: vdixit@akamai.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Dec 2017 15:23:29 +0530 Message-Id: <1514282009-7329-1-git-send-email-vdixit@akamai.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1512724625-7671-1-git-send-email-vdixit@akamai.com> References: <1512724625-7671-1-git-send-email-vdixit@akamai.com> X-Smtpcorp-Track: 1-T_vTNmFU157z.Q_w-CBv-x Feedback-ID: 337386m:337386asVRLGB:337386swiMgMHkfJ:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH v2 1/3] avformat/hlsenc: revamped master playlist url creation logic 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: Vishwanath Dixit MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Vishwanath Dixit --- libavformat/hlsenc.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 74f66ce..bd43336 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1697,28 +1697,30 @@ static int update_variant_stream_info(AVFormatContext *s) { static int update_master_pl_info(AVFormatContext *s) { HLSContext *hls = s->priv_data; - int m3u8_name_size, ret; - char *p; + const char *dir; + char *fn; + int ret = 0; - m3u8_name_size = strlen(s->filename) + strlen(hls->master_pl_name) + 1; - hls->master_m3u8_url = av_malloc(m3u8_name_size); - if (!hls->master_m3u8_url) { + fn = av_strdup(s->filename); + if (!fn) { ret = AVERROR(ENOMEM); - return ret; + goto fail; } - av_strlcpy(hls->master_m3u8_url, s->filename, m3u8_name_size); - p = strrchr(hls->master_m3u8_url, '/') ? - strrchr(hls->master_m3u8_url, '/') : - strrchr(hls->master_m3u8_url, '\\'); - if (p) { - *(p + 1) = '\0'; - av_strlcat(hls->master_m3u8_url, hls->master_pl_name, m3u8_name_size); - } else { - av_strlcpy(hls->master_m3u8_url, hls->master_pl_name, m3u8_name_size); + dir = av_dirname(fn); + if (dir && strcmp(dir, ".")) + hls->master_m3u8_url = av_append_path_component(dir, hls->master_pl_name); + else + hls->master_m3u8_url = av_strdup(hls->master_pl_name); + + if (!hls->master_m3u8_url) { + ret = AVERROR(ENOMEM); + goto fail; } - return 0; +fail: + av_freep(&fn); + return ret; } static int hls_write_header(AVFormatContext *s)