From patchwork Fri Aug 30 03:45:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 14809 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 118B34476F3 for ; Fri, 30 Aug 2019 06:45:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E38546808CD; Fri, 30 Aug 2019 06:45:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CEA66805BB for ; Fri, 30 Aug 2019 06:45:47 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id h3so2662486pls.7 for ; Thu, 29 Aug 2019 20:45:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JptKaElbkw+80Dzuh/iiQwsUg2ULFtYbtguOXFxnXBU=; b=MeWm8TDq+P5tOJLqC4dBwbzBffneQ+Kdqc0baVjBCNdGOeiVBw+m4bCfUXVqcovdc+ iuSQBmhIFrqFlvZ6lUE5zbpQM/bZIn0mYtsDUyMslIovQdCe68MAsfh3EtNtkwfLnHTL qzo3kR/Qi+s1sV2jFJCBgyKoC0KHyooc3PbtkM/JG5qtpqS6X8O1HxIALQPxbYIgHNpP 3YfVmUYNTUORsSHbH0Ojhhjjun6dV2rIEO760fzamqyDwi8wNGdxzdCpYEcKfPpxOy+Q 3Cdd5IGF77jdJPdYFwzHhWSe5cVhSARUbq4B6NSHuxm/2tDv87G2N7VWkXjaWO0aeQst XITQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JptKaElbkw+80Dzuh/iiQwsUg2ULFtYbtguOXFxnXBU=; b=p+SsW7FtSr5P9d3x22EWNUnjlVAu//dxsLtENNIW/xIto/eW3V8bctYWA2IlbRkbz7 ddb5+NfEF/FHhZmDCwsh/59mDMy5q6JH3zwWqXNlp1eWBOWCphLaxYleXQWNpOy9NJ/s b0ToiYROZzDaJTNBK3W5nQVWBCWSTKGcbUgixAm/Ko6BIgKnmgh+K/XVMN/wNugAJvpM g7/+/bUuPjpXtxod9yl2ejvE48kr0rX1VeK58Hc3WUi2Hs3KYUXtm9axWRdnog8p4dwO rVZjzI5H8OJWwLuFVKrw73f1qMItH7o2i063EVhqixoyqh7Fxo9Uo/orfK77LnLjoVpu SGzw== X-Gm-Message-State: APjAAAVk55YcedVTmY/ABbKreGnUTFkzo4guIlbqEEUqVfuxGRR/WUAc u5gyaNqHRzGN6Murh5l7XfjZ/DU3 X-Google-Smtp-Source: APXvYqziRi3rCuzgDHDO23UC4jIPHpmP4Uki6oFUN3U9xO8EZ9TodVIERBBdD+cPkzHY2Z6uragasg== X-Received: by 2002:a17:902:bf07:: with SMTP id bi7mr13848877plb.167.1567136745495; Thu, 29 Aug 2019 20:45:45 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id e129sm10899143pfa.92.2019.08.29.20.45.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Aug 2019 20:45:44 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Aug 2019 11:45:39 +0800 Message-Id: <20190830034539.26561-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190819161556.25450-1-lance.lmwang@gmail.com> References: <20190819161556.25450-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1] lavf/hlsenc: refine the get_relative_url function to avoid extra malloc for relation path 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Reviewed-by: Steven Liu Signed-off-by: Limin Wang --- libavformat/hlsenc.c | 50 ++++++++++++++--------------------------------- libavformat/hlsplaylist.c | 4 ++-- libavformat/hlsplaylist.h | 4 ++-- 3 files changed, 19 insertions(+), 39 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index f6f9c81..e5d7791 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1229,22 +1229,22 @@ static int hls_rename_temp_file(AVFormatContext *s, AVFormatContext *oc) return ret; } -static int get_relative_url(const char *master_url, const char *media_url, - char *rel_url, int rel_url_buf_size) +static const char* get_relative_url(const char *master_url, const char *media_url) { - char *p = NULL; - int base_len = -1; - p = strrchr(master_url, '/') ? strrchr(master_url, '/') :\ - strrchr(master_url, '\\'); + const char *p = strrchr(master_url, '/'); + size_t base_len = 0; + + if (!p) p = strrchr(master_url, '\\'); + if (p) { - base_len = FFABS(p - master_url); + base_len = p + 1 - master_url; if (av_strncasecmp(master_url, media_url, base_len)) { av_log(NULL, AV_LOG_WARNING, "Unable to find relative url\n"); - return AVERROR(EINVAL); + return NULL; } } - av_strlcpy(rel_url, &(media_url[base_len + 1]), rel_url_buf_size); - return 0; + + return media_url + base_len; } static int64_t get_stream_bit_rate(AVStream *stream) { @@ -1270,8 +1270,9 @@ static int create_master_playlist(AVFormatContext *s, AVStream *vid_st, *aud_st; AVDictionary *options = NULL; unsigned int i, j; - int m3u8_name_size, ret, bandwidth; - char *m3u8_rel_name = NULL, *ccgroup; + int ret, bandwidth; + const char *m3u8_rel_name = NULL; + char *ccgroup; ClosedCaptionsStream *ccs; const char *proto = avio_find_protocol_name(hls->master_m3u8_url); int is_file_proto = proto && !strcmp(proto, "file"); @@ -1320,39 +1321,21 @@ static int create_master_playlist(AVFormatContext *s, if (vs->has_video || vs->has_subtitle || !vs->agroup) continue; - m3u8_name_size = strlen(vs->m3u8_name) + 1; - m3u8_rel_name = av_malloc(m3u8_name_size); + m3u8_rel_name = get_relative_url(hls->master_m3u8_url, vs->m3u8_name); if (!m3u8_rel_name) { - ret = AVERROR(ENOMEM); - goto fail; - } - av_strlcpy(m3u8_rel_name, vs->m3u8_name, m3u8_name_size); - ret = get_relative_url(hls->master_m3u8_url, vs->m3u8_name, - m3u8_rel_name, m3u8_name_size); - if (ret < 0) { av_log(s, AV_LOG_ERROR, "Unable to find relative URL\n"); goto fail; } ff_hls_write_audio_rendition(hls->m3u8_out, vs->agroup, m3u8_rel_name, vs->language, i, hls->has_default_key ? vs->is_default : 1); - - av_freep(&m3u8_rel_name); } /* For variant streams with video add #EXT-X-STREAM-INF tag with attributes*/ for (i = 0; i < hls->nb_varstreams; i++) { vs = &(hls->var_streams[i]); - m3u8_name_size = strlen(vs->m3u8_name) + 1; - m3u8_rel_name = av_malloc(m3u8_name_size); + m3u8_rel_name = get_relative_url(hls->master_m3u8_url, vs->m3u8_name); if (!m3u8_rel_name) { - ret = AVERROR(ENOMEM); - goto fail; - } - av_strlcpy(m3u8_rel_name, vs->m3u8_name, m3u8_name_size); - ret = get_relative_url(hls->master_m3u8_url, vs->m3u8_name, - m3u8_rel_name, m3u8_name_size); - if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Unable to find relative URL\n"); goto fail; } @@ -1421,13 +1404,10 @@ static int create_master_playlist(AVFormatContext *s, aud_st ? vs->agroup : NULL, vs->codec_attr, ccgroup); } } - - av_freep(&m3u8_rel_name); } fail: if(ret >=0) hls->master_m3u8_created = 1; - av_freep(&m3u8_rel_name); hlsenc_io_close(s, &hls->m3u8_out, temp_filename); if (use_temp_file) ff_rename(temp_filename, hls->master_m3u8_url, s); diff --git a/libavformat/hlsplaylist.c b/libavformat/hlsplaylist.c index e8b5667..9cbd023 100644 --- a/libavformat/hlsplaylist.c +++ b/libavformat/hlsplaylist.c @@ -36,7 +36,7 @@ void ff_hls_write_playlist_version(AVIOContext *out, int version) { } void ff_hls_write_audio_rendition(AVIOContext *out, char *agroup, - char *filename, char *language, int name_id, int is_default) { + const char *filename, char *language, int name_id, int is_default) { if (!out || !agroup || !filename) return; @@ -49,7 +49,7 @@ void ff_hls_write_audio_rendition(AVIOContext *out, char *agroup, } void ff_hls_write_stream_info(AVStream *st, AVIOContext *out, - int bandwidth, char *filename, char *agroup, + int bandwidth, const char *filename, char *agroup, char *codecs, char *ccgroup) { if (!out || !filename) diff --git a/libavformat/hlsplaylist.h b/libavformat/hlsplaylist.h index 8d2d83b..a8d29d6 100644 --- a/libavformat/hlsplaylist.h +++ b/libavformat/hlsplaylist.h @@ -38,9 +38,9 @@ typedef enum { void ff_hls_write_playlist_version(AVIOContext *out, int version); void ff_hls_write_audio_rendition(AVIOContext *out, char *agroup, - char *filename, char *language, int name_id, int is_default); + const char *filename, char *language, int name_id, int is_default); void ff_hls_write_stream_info(AVStream *st, AVIOContext *out, - int bandwidth, char *filename, char *agroup, + int bandwidth, const char *filename, char *agroup, char *codecs, char *ccgroup); void ff_hls_write_playlist_header(AVIOContext *out, int version, int allowcache, int target_duration, int64_t sequence,