From patchwork Mon May 25 19:43:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19865 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 726E5449D0B for ; Mon, 25 May 2020 22:43:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 534B9689248; Mon, 25 May 2020 22:43:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 97B5D6881BD for ; Mon, 25 May 2020 22:43:35 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id q11so5955231wrp.3 for ; Mon, 25 May 2020 12:43:35 -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 :mime-version:content-transfer-encoding; bh=NY7eTaChGOaeYDRvO4UDRYN6t/diVcGzub97vc0/rjY=; b=P22CbbKKlX9yki1SePhm/TyvyiIOiYw9nm8P3tWRmvIX41+45GhMqz19zpsiNVklqj ddJ9A6Kvm2ofPf0WU4GM1zx/8HyZpfrQrFsY0O0AWviVdnq7/7gFJwis6nj4Yrx09RVA j8sq991iA5BIFhfc1cHmgeqtVUz7EBNmaq9McaUytK1dStBC22g2lJz96GXgqHRkbhUl zbLQGuqvt6dSQDM3QwNxByANuDf7NgVqa3uabLFtChC72J5k+TvkbHlugM/5L/4hcJcS jlXOaLO/khpEid4Sl6Oe/NiwNdOGy5KOpzYOhMlx+eLDksQo8xDqBMtZNidbZ3uyNrkX q30g== 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:mime-version:content-transfer-encoding; bh=NY7eTaChGOaeYDRvO4UDRYN6t/diVcGzub97vc0/rjY=; b=X09JUWPmzXP8B4D1FKWI4xUh3m36+SAUW5UNimjLkiL9+4osmIE+TOf4KYn7tS7LC2 QVDIFLNVveoyoQ0eSioY8IyMHYms6wQmJ5gV/CBc3r8mF0E81YgitVAApjQJgyvxNism etS13C0CoKcp/ryu7HcLO1AtrjpVXB3Q+qrWMlXDWKeujPOB2My9Ki6iDojSTpo95PUj mVcYBDIS0GuK0wVYX8lwhH66Lw1XI32zapnp7ciNrVE1I3z3WtG3/6rq8SjUdXQWLLq0 NSRmpEfrI+wSGNEjY5AHfrgWOZI/8u2EkCGdyaq2a9sP43EoVaCf8zSm88TyfTmMGMN2 g7yw== X-Gm-Message-State: AOAM5338NH/Z446mYusqIxURDVAKs1StLChwn9WCAyJW7VKaPPMtv9yH LPpbNh3bg9qE3JoTJ/+vwDBvas/v X-Google-Smtp-Source: ABdhPJxwHkHxFR5RpNkkdIMHUDYx2ApXHNiJA0xiJGbiSRc5IrRSSzI9EHLGqWucLI1WR1HCogHXbw== X-Received: by 2002:a5d:45c2:: with SMTP id b2mr15686334wrs.323.1590435814802; Mon, 25 May 2020 12:43:34 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id l204sm9254368wmf.19.2020.05.25.12.43.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 May 2020 12:43:34 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 May 2020 21:43:00 +0200 Message-Id: <20200525194302.24515-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200525194302.24515-1-andreas.rheinhardt@gmail.com> References: <20200525194302.24515-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/hlsenc: Don't unnecessarily duplicate baseurl string 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Up until now, the HLS muxer duplicated a string for every VariantStream, although neither the original nor the copies are ever modified. So use the original directly and stop copying. Signed-off-by: Andreas Rheinhardt --- libavformat/hlsenc.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 1bc3cb210b..77e49b44b1 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -177,7 +177,6 @@ typedef struct VariantStream { char *agroup; /* audio group name */ char *sgroup; /* subtitle group name */ char *ccgroup; /* closed caption group name */ - char *baseurl; char *varname; // variant name } VariantStream; @@ -1525,7 +1524,7 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs) ret = ff_hls_write_file_entry(byterange_mode ? hls->m3u8_out : vs->out, en->discont, byterange_mode, en->duration, hls->flags & HLS_ROUND_DURATIONS, - en->size, en->pos, vs->baseurl, + en->size, en->pos, hls->baseurl, en->filename, prog_date_time_p, en->keyframe_size, en->keyframe_pos, hls->flags & HLS_I_FRAMES_ONLY); if (ret < 0) { av_log(s, AV_LOG_WARNING, "ff_hls_write_file_entry get error\n"); @@ -1547,7 +1546,7 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs) for (en = vs->segments; en; en = en->next) { ret = ff_hls_write_file_entry(hls->sub_m3u8_out, 0, byterange_mode, en->duration, 0, en->size, en->pos, - vs->baseurl, en->sub_filename, NULL, 0, 0, 0); + hls->baseurl, en->sub_filename, NULL, 0, 0, 0); if (ret < 0) { av_log(s, AV_LOG_WARNING, "ff_hls_write_file_entry get error\n"); } @@ -2581,7 +2580,6 @@ static void hls_deinit(AVFormatContext *s) av_freep(&vs->sgroup); av_freep(&vs->language); av_freep(&vs->ccgroup); - av_freep(&vs->baseurl); av_freep(&vs->varname); } @@ -2956,12 +2954,6 @@ static int hls_init(AVFormatContext *s) *p = '.'; } - if (hls->baseurl) { - vs->baseurl = av_strdup(hls->baseurl); - if (!vs->baseurl) - return AVERROR(ENOMEM); - } - if ((ret = hls_mux_init(s, vs)) < 0) return ret;