From patchwork Tue Dec 26 11:16:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dixit, Vishwanath" X-Patchwork-Id: 6987 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp6728773jad; Tue, 26 Dec 2017 03:17:12 -0800 (PST) X-Google-Smtp-Source: ACJfBouaZMah5iffJI10BJJ21J6VSIgpy/W/ly4FMKOea0B4qL7CsrRN6k1NdlTiaU82cPveLN5C X-Received: by 10.28.185.68 with SMTP id j65mr20016791wmf.135.1514287032889; Tue, 26 Dec 2017 03:17:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514287032; cv=none; d=google.com; s=arc-20160816; b=o80FFCc6E5b8ThGKLcn67qJIUlG4h9Swa0d/vd8cR/tnd2cM0ga4fwlOFGHLxqtz9N hFGOvWRgpHy61Q6k+FkSYpgYPUFDmcWYZ1lQIMwYD/DKUOqYH5vvsf6GeJIhTzGE4YfR jfNcXs/kQ+0K9KMNSPuRxvm0WWG4eZg5mphQJHmbdAC9xWdz3E3GOj9l0qHzLKrysydp kgPRJMHIQTspAfX9lHVsC6IRvnJfrJx4c5vEPsZNv4WjMRRUTV+TJJ9a0vYZRRj+aOFi csBeB+SrsTFJMU+rYFOKCxfdfzkK6j9sbDLN7311j3+Ca7bcqoDe/RBVwN1FPrrx2mYV D+qQ== 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=V6sGQvQAUvZ0JseGKZP3Vmcfzb53bYNxSyWpHKSmHv+pPEWGtBMaetg79PoFmJ6J1s vs2qoZL3a6RbEdOZp6Dbu1dwLl7qilYouaOM4n2f9EECB+jrg7YFnHoEmQzZQv+KoW69 mkXrhbxIBSWznnLmr7oJD9gQzkysSvg5F5Mcv1jB5GwgJ4i3WePnwmehHQlpRVoMsPpJ oP1vtyvw0Vuh2UcKo6th5WuMdZpa/KUo52ww0jUJNE/WmtukbNcai7inXf6Z4cQnU+/+ fagLYeA+UNeO/5E0I9cMIv//uU1ssHBbJUqBluRWroAXHJKyU8Fz6NvT1jgQCDBGIAjw bwmA== 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=avmyy8i2; 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 f7si7831792wrg.465.2017.12.26.03.17.12; Tue, 26 Dec 2017 03:17:12 -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=avmyy8i2; 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 EF9FE688312; Tue, 26 Dec 2017 13:16:57 +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 5BF896882FF for ; Tue, 26 Dec 2017 13:16:51 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1514287930; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=at/w/vKmvVXkszgukQmhaSBxXdKvjbSgdpWxFqohgm0=; b=avmyy8i2 O2EMTue8cGXhILd8FEahgYg3gK/dBd/PPY16GfVmp48ytBj+IAp8wUp7e9nyfqO6pXXQeow/h+dIS 7O5yjgf3EzEVWm+9T5L7FIFl6/iAOt2XYQg5ZIib/4k7s9Z+tKODQqTbph5VNwl26L9hpMmBHaKc5 6k2Qf7+4OaWLE2vgupGzSNxcycVH8O4eMtw8/M5clOEyUA3v2u5mZBVW/kkLOxmr4I7s31AhPis+C 5BRvAohYKRMwvWRcHae9CmNgx3dCvIZWEcR3wySxW7e6jeBS/vMDK/FsYRtVjdaUgPNDr1LXhVGKV 4E98dLdJmZzTuNNmXp4O2KzODw==; From: vdixit@akamai.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Dec 2017 16:46:58 +0530 Message-Id: <1514287018-21899-1-git-send-email-vdixit@akamai.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1514282009-7329-1-git-send-email-vdixit@akamai.com> References: <1514282009-7329-1-git-send-email-vdixit@akamai.com> X-Smtpcorp-Track: 1-TnEEDIIfP334.QXAviFlns Feedback-ID: 337386m:337386asVRLGB:337386sFH-h_dfO2:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH v3 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)