From patchwork Sat May 9 19:15:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19586 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 2BC8A4499FD for ; Sat, 9 May 2020 22:15:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1101C68A0C7; Sat, 9 May 2020 22:15:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B954E689E40 for ; Sat, 9 May 2020 22:15:40 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id l18so5864318wrn.6 for ; Sat, 09 May 2020 12:15:40 -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=8pIXV2w5tTtdyCxamIHytVvk/rRewi/YrUFv840lsZA=; b=OImLcZVgW52oy8j1VBpVGW77mMVIRg8+8NV+I8D6NivZhcWoBN+tT4j9xjr6hvVjwD uDTAvjaQxpiv2ZVB7WWPk0LwLYiKOzPXC66D2YU/XGbDBn7+lUau1sKerFwLWMWqtpbb MvX9xirvuEZmqQO+5h3ig8WKzkdl1qn0vxKkFd/wjFGKQYOLkp4vqKo3OwR1GQQjXvDv GnZESkmcOppOsvkyGcgiEk2MZfUY3E2dWp1VN5SwN/cyU4RJsRXdINraN7p5A7OMzQ0o QHLondfKSylk+rH+qBmbkMTUDiGNGP/n/mZFVT6fM5GH3Xef/hHm8nOby0yVmFrUzjt7 OnTg== 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=8pIXV2w5tTtdyCxamIHytVvk/rRewi/YrUFv840lsZA=; b=fdDfK88EvHXcAqKDngHx4wvA2xtYtuv29+gSJZrrq5f8hCDGrGkFzb31RT15+zdydI qJIoKXBkw187dPN9mshqRUoWCSHV3D3BmwOHwFLjFqE256UhaSss/JzqabmW4hfOGQSL WL1PKmdjFrQYdrgKor24h66LNfAM/6ZpfJsLUJic/a1w5hz74seMvIG+f6rkIRhMZeO+ GSFnkrrFXi2cshHJ++/+VZd2LhflTg+1uSKFvNJ5FHVDQaXjSWycSZ7g7bvMoPpwhFXc COZxUECuZXovmkJ8aPfkwkOElhSWj6y0nD9LvnUl2PXrCGExfLHnNZvUM1SWr1CrTlXm dWvQ== X-Gm-Message-State: AGi0PuY/1lggy+DZDcO1OmU2hE7luz2MWkVRRlepAsV0MgKQE5AAJJRV dbYbB19GWsfSC64ytzRCgGlk6wez X-Google-Smtp-Source: APiQypLEvXnAw0yrU9ZmxZuH8b2t9EgbdlscVImFB6he6iKJNxvJ+1O3rdl68pgqhqMqEWlZRjM90g== X-Received: by 2002:adf:f205:: with SMTP id p5mr1846346wro.49.1589051739883; Sat, 09 May 2020 12:15:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2020 12:15:38 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 May 2020 21:15:08 +0200 Message-Id: <20200509191509.9812-5-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 5/6] avformat/hlsenc: Simplify setting 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 --- libavformat/hlsenc.c | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 5517cb4354..d80852739e 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2739,15 +2739,21 @@ static int hls_init(AVFormatContext *s) int i = 0; int j = 0; HLSContext *hls = s->priv_data; - const char *pattern = "%d.ts"; + const char *pattern; VariantStream *vs = NULL; - int basename_size = 0; - const char *pattern_localtime_fmt = get_default_pattern_localtime_fmt(s); const char *vtt_pattern = hls->flags & HLS_SINGLE_FILE ? ".vtt" : "%d.vtt"; char *p = NULL; int http_base_proto = ff_is_http_proto(s->url); int fmp4_init_filename_len = strlen(hls->fmp4_init_filename) + 1; + if (hls->use_localtime) { + pattern = get_default_pattern_localtime_fmt(s); + } else { + pattern = hls->segment_type == SEGMENT_TYPE_FMP4 ? "%d.m4s" : "%d.ts"; + if (hls->flags & HLS_SINGLE_FILE) + pattern += 2; + } + hls->has_default_key = 0; hls->has_video_m3u8 = 0; ret = update_variant_stream_info(s); @@ -2792,9 +2798,6 @@ static int hls_init(AVFormatContext *s) } } - if (hls->segment_type == SEGMENT_TYPE_FMP4) { - pattern = "%d.m4s"; - } if ((hls->start_sequence_source_type == HLS_START_SEQUENCE_AS_SECONDS_SINCE_EPOCH) || (hls->start_sequence_source_type == HLS_START_SEQUENCE_AS_MICROSECONDS_SINCE_EPOCH) || (hls->start_sequence_source_type == HLS_START_SEQUENCE_AS_FORMATTED_DATETIME)) { @@ -2868,34 +2871,16 @@ static int hls_init(AVFormatContext *s) if (ret < 0) return ret; } else { - if (hls->flags & HLS_SINGLE_FILE) { - if (hls->segment_type == SEGMENT_TYPE_FMP4) { - pattern = ".m4s"; - } else { - pattern = ".ts"; - } - } - - if (hls->use_localtime) { - basename_size = strlen(vs->m3u8_name) + strlen(pattern_localtime_fmt) + 1; - } else { - basename_size = strlen(vs->m3u8_name) + strlen(pattern) + 1; - } + p = strrchr(vs->m3u8_name, '.'); + if (p) + *p = '\0'; - vs->basename = av_malloc(basename_size); + vs->basename = av_asprintf("%s%s", vs->m3u8_name, pattern); if (!vs->basename) return AVERROR(ENOMEM); - av_strlcpy(vs->basename, vs->m3u8_name, basename_size); - - p = strrchr(vs->basename, '.'); if (p) - *p = '\0'; - if (hls->use_localtime) { - av_strlcat(vs->basename, pattern_localtime_fmt, basename_size); - } else { - av_strlcat(vs->basename, pattern, basename_size); - } + *p = '.'; } if (hls->segment_type == SEGMENT_TYPE_FMP4) {