From patchwork Sat May 9 19:15:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19585 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 1762E4499FD for ; Sat, 9 May 2020 22:15:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F11E2689EBE; Sat, 9 May 2020 22:15:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A18C2689B76 for ; Sat, 9 May 2020 22:15:39 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id g12so14282146wmh.3 for ; Sat, 09 May 2020 12:15:39 -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=PZ/a/SrTyooyYUey/sFVCW3kw5f7356U3ccsqFYM7+8=; b=WCgs1fMSy3TIPHQtbffszqitUJKsvnRFaiLF+4AcXsqhM57xwhxHR0Xnl2aDIK+7GK tr32X4O44SVa8CgVp2HJOjQy0rem9VZn7aGrPSXyDYYgA1XYnW5BO7iHJgRBJvSsyCQe hv36ZZBlE40zrY2TiNUUVSH+hkxYisPYdZdEoLFD9giDEqx/Rz32APL/oWIqiPPZapGS gQF89HsYElfvg4GeEujwnXGRzFvFI9p8sc69ySmJBycXlblFTuZj61kIC+YteDfX/vLo pc+GLAkG8cqqluTrOWB2a5YEkha45RKFodr/kdnP34Qw12gpYkAzraRteNWTHUrq+g8N jUoQ== 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=PZ/a/SrTyooyYUey/sFVCW3kw5f7356U3ccsqFYM7+8=; b=bm8k4bPj7FHkzFfZonazyjnkaByDa8WB6zjocdPDpuFYfdDiNrocmktT7wh8yZzO/d Wkgwa+DwC97ZnjFobIy4OohNWo9iCEGRWb1aG1TdVRJ75CVeaenppZiRYzyf5eSVpQNi DP3ueTSjSmpHdJAVMlyyhLa4547AbUXYk/qEylPZEh78keeRPf11IgD2NSgynbX/3PJN p4JJc1nfHdgJdQ+Y31A6DRnFmAq4M40ujCjr08zaeCu15Rjp04+421BL2m3CqF8FzIfz PPUQ0M0pnmmvuVfI0MWP+O8k1n9vSQ73C7keS7aQbEkGR0CEXJOO72WrRV6PryMkGStL 6DMg== X-Gm-Message-State: AGi0PuY0Ea/KbLdsMqLYMWn5yF/eFqaVXZKOxaWBBms/Q2oaCfQYkc6p nwmT39JkeJZq11Nm791IjnSR99zZ X-Google-Smtp-Source: APiQypIkFmd50bUMe2td1ue6KIq+2WTP+nPJnA7RYoCF79LdDMjsm+OeY0r5SFoxulNL+vTemLF1MA== X-Received: by 2002:a7b:c38b:: with SMTP id s11mr22583293wmj.55.1589051738567; Sat, 09 May 2020 12:15:38 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id w9sm10055217wrc.27.2020.05.09.12.15.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2020 12:15:37 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 May 2020 21:15:07 +0200 Message-Id: <20200509191509.9812-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200509191509.9812-1-andreas.rheinhardt@gmail.com> References: <20200509191509.9812-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/6] avformat/hlsenc: Simplify setting subtitle basename with av_asprintf 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" Signed-off-by: Andreas Rheinhardt --- This patch is designed not to change the output at all. Yet I wonder if instead of p = strrchr(vs->m3u8_name, '.') it should not better be p = strrchr(av_basename(vs->m3u8_name), '.'). Otherwise in a path like "./hlsstream/master" everything after '.' will be treated as extension which does not seem to be intended. The same remark also applies to e.g. the next patch. libavformat/hlsenc.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 2a0d17baea..5517cb4354 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2743,9 +2743,8 @@ static int hls_init(AVFormatContext *s) VariantStream *vs = NULL; int basename_size = 0; const char *pattern_localtime_fmt = get_default_pattern_localtime_fmt(s); - const char *vtt_pattern = "%d.vtt"; + const char *vtt_pattern = hls->flags & HLS_SINGLE_FILE ? ".vtt" : "%d.vtt"; char *p = NULL; - int vtt_basename_size = 0; int http_base_proto = ff_is_http_proto(s->url); int fmp4_init_filename_len = strlen(hls->fmp4_init_filename) + 1; @@ -2954,28 +2953,25 @@ static int hls_init(AVFormatContext *s) if (!vs->vtt_oformat) return AVERROR_MUXER_NOT_FOUND; - if (hls->flags & HLS_SINGLE_FILE) - vtt_pattern = ".vtt"; - vtt_basename_size = strlen(vs->m3u8_name) + strlen(vtt_pattern) + 1; + p = strrchr(vs->m3u8_name, '.'); + if (p) + *p = '\0'; - vs->vtt_basename = av_malloc(vtt_basename_size); + vs->vtt_basename = av_asprintf("%s%s", vs->m3u8_name, vtt_pattern); if (!vs->vtt_basename) return AVERROR(ENOMEM); - av_strlcpy(vs->vtt_basename, vs->m3u8_name, vtt_basename_size); - p = strrchr(vs->vtt_basename, '.'); - if (p) - *p = '\0'; if (hls->subtitle_filename) { ret = format_name(hls->subtitle_filename, &vs->vtt_m3u8_name, i, vs->varname); if (ret < 0) return ret; } else { - vs->vtt_m3u8_name = av_asprintf("%s_vtt.m3u8", vs->vtt_basename); + vs->vtt_m3u8_name = av_asprintf("%s_vtt.m3u8", vs->m3u8_name); if (!vs->vtt_m3u8_name) return AVERROR(ENOMEM); } - av_strlcat(vs->vtt_basename, vtt_pattern, vtt_basename_size); + if (p) + *p = '.'; } if (hls->baseurl) {