From patchwork Mon Aug 19 16:15:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 14588 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 D91E3446F4E for ; Mon, 19 Aug 2019 19:22:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A19E768A559; Mon, 19 Aug 2019 19:22:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B6C6E68A101 for ; Mon, 19 Aug 2019 19:22:42 +0300 (EEST) Received: by mail-pg1-f193.google.com with SMTP id p3so1490139pgb.9 for ; Mon, 19 Aug 2019 09:22:42 -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; bh=rBd3JKGeAM/M04UkomEswf33Z9cwxeJPHzn/AorPBwI=; b=Bn1sGam92cR7rcm75YnFd6RX7VBRczVCeqL9YBKUfXZOlIYrjjMdl2smyEAkxlCONG iR4/pjg3vmSaBQSDt4rfsWjGxcekETvSuovFgjpWXnfYBdIoIiCToA17t+l1IUiLc8ZY 32D1J/KLdDxVJjtFSSfdrAEEyN4STGdg09So3sbED37ALF0MKvImQrHD+Zu1AjMVqhMH zswmIMdtgJjpdugbRd884eJS0by8OocSoHHykXoWKUsrTrkDnJveqYWTNN59FjhlKIZs oeo4dkFAuzMaGWd2WQM9SGDVKnr3ywulr+trwtfxuWQAG6QoLXxZybRNxKzvrZb9gilA /9gw== 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; bh=rBd3JKGeAM/M04UkomEswf33Z9cwxeJPHzn/AorPBwI=; b=eGerMYXJoDFl2iMMPgOVWtd4M/JBrjETu5BxpM53UxzA7geeftKrjx3omzr/Q6E9j3 w/G9aPW9R/HGC4ZwsKhIS3yRhtMFILystIefkJjnTJzWZ6y9JORnseM6sotiqkYFZzQd wJzXFlUoBnbYh7z3LqsJsW4R2Ah1C66v5RqSZC4z5XBK2Ud4qguCKlfhdizpytL5Vn+J 0S4pBih2UqUisT5r6FYK+h1u2uI6WwRG1aTCwRrn/HqvgV0Vs/pU0hcP7YusD7e7yv+T WLWdzaOCI9r1ac7aDUFsxOgh1TdnxEEBLayVsbolHIT4UzOEYRJ0dewgwVCg86hG4kEm oQ0Q== X-Gm-Message-State: APjAAAWtfjZ3ThW4wC/JeSmMHMO+v2esUwWyGUky7VxDGbf4eyLKXshg d+t+1s0WZsLEwhUeX0cfrJiMejAZ X-Google-Smtp-Source: APXvYqzwGRN6AJfRuqeV1ZwWqeX8kPv/p/G/u2lzrrrkisudjPu7fEIcS/M5pfLbuigqWZnB/hEAWw== X-Received: by 2002:a17:90a:1110:: with SMTP id d16mr22176291pja.29.1566231361399; Mon, 19 Aug 2019 09:16:01 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id j5sm14225774pgp.59.2019.08.19.09.15.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Aug 2019 09:16:00 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Aug 2019 00:15:56 +0800 Message-Id: <20190819161556.25450-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 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 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,