From patchwork Mon Oct 10 08:53:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George-Cristian Jiglau X-Patchwork-Id: 38651 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp258610pzb; Mon, 10 Oct 2022 01:53:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4IGMVgxaWiEGk0UEMDw1EOxgzM4112i1aZ8o49DDrJYXHY0C4C0RdmG7DA4ldQ1G/B9EI8 X-Received: by 2002:a05:6402:ea0:b0:454:38bf:aa3d with SMTP id h32-20020a0564020ea000b0045438bfaa3dmr16735675eda.291.1665392009808; Mon, 10 Oct 2022 01:53:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665392009; cv=none; d=google.com; s=arc-20160816; b=S7aAt0pyxCwbrkqa8meqnkseakBKmcAYJBc3XV2giNMQj+/x8C5274u/ODOUnPuy8T nbMIGqBVR+sa0V+gSc2ky67I/iTS9USmO15lhBFtVJDfPY239h/CO3slDfavEZM8EjBE tFv13DO4/fxoZEwDuf16Y9GPKhPbxfIvBbCbGhRdnTURlyl+uOEBSLUWWEMrKDnXNE8D jS117JK3xWhZwO5o2kRkUd7KVAYY0QgUjqwRSPlGgJXC1+lh2bSsHKR3s7FEyQS6Fkoq 8EwpCVbFAT7Z7LWuyqX6ikRrLvvYYa1GrxorJiTCLVMGIDK1OjCMQ4kItdw6ZVQsawo9 IcsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:to:from:mime-version:date :dkim-signature:message-id:delivered-to; bh=wOw61CGzfPwFDFTv7LtXiMNFeEQRXe0XXLu/Qzs//ro=; b=One/UJvb0IsuO46r8No/bXWa9xxzzyKmlRZ5KdeO392u3TL1mBP9o4JjpMLVF8hIp1 LYZBmm5MJIuPEDwKhvfb8fZJrbQyc0PB7t0L09xzYaZda7sQ4+nBgmtj0SAQK986vt+E jcQfIFEt1k9k97OEeSlvbWVHHwhwq1ZPMXxAnt4cIhK9TNBpfD9I+aUhUyeaLzSHkVt9 WnH7gkI58P4VShYVGAGluR7I6zdQ6QXNmgJHmIL9T2PGsQBPJCX4EN/oeitp+It+w2DB jXgILIzfywf/MfilR7FYtByufCRSMF8gljWnc8IR3P9Cl2AiG0JldFPoRbQMEfxKGzAS gAiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sx.gl header.s=mail header.b=HYQVnrp7; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=sx.gl Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q16-20020a056402033000b004513a465ec6si8327347edw.94.2022.10.10.01.53.27; Mon, 10 Oct 2022 01:53:29 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sx.gl header.s=mail header.b=HYQVnrp7; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=sx.gl Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E1D9568B1E1; Mon, 10 Oct 2022 11:53:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.sx.gl (unknown [86.127.212.246]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 60FD068B1E1 for ; Mon, 10 Oct 2022 11:53:17 +0300 (EEST) Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sx.gl; s=mail; t=1665391996; bh=BPnx5BBtAUOM1LfXMz4BvhlcSUd00sAo8XqpPCYGb9M=; h=Date:From:Subject:To; b=HYQVnrp7om5S6yC3JLtpUiFoEnopR8GdtHqquXnpnek/hxk2+vC9dx7ysYmJW+lWM xPP8GeaRLtq0t3eHafIdYHEl+MHAogz49YTPnxG+70eoNtGCuxXy7T8ZhCZDgQJKSx +AgpLWZIrHDP772QyZltZSXodYSx8p45PRr9+31c= Date: Mon, 10 Oct 2022 11:53:15 +0300 MIME-Version: 1.0 From: george To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] avformat/segment: add -strftime_mkdir option X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Kn7vuhxSGPrr This enabled automatically creating directories for strftime-formatted segment names. Signed-off-by: George-Cristian Jiglau --- doc/muxers.texi | 11 +++++++++++ libavformat/segment.c | 18 +++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) av_log(oc, AV_LOG_ERROR, "Could not get segment filename with strftime\n"); return AVERROR(EINVAL); } + if (seg->use_strftime_mkdir) { + const char *dir; + char *fn_copy = av_strdup(oc->url); + if (!fn_copy) + return AVERROR(ENOMEM); + dir = av_dirname(fn_copy); + if (ff_mkdir_p(dir) == -1 && errno != EEXIST) { + av_log(oc, AV_LOG_ERROR, "Could not create directory %s with strftime_mkdir\n", dir); + av_freep(&fn_copy); + return AVERROR(errno); + } + av_freep(&fn_copy); + } } else if (av_get_frame_filename(buf, sizeof(buf), s->url, seg->segment_idx) < 0) { av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s'\n", s->url); @@ -1038,6 +1053,7 @@ static const AVOption options[] = { { "segment_start_number", "set the sequence number of the first segment", OFFSET(segment_idx), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E }, { "segment_wrap_number", "set the number of wrap before the first segment", OFFSET(segment_idx_wrap_nb), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E }, { "strftime", "set filename expansion with strftime at segment creation", OFFSET(use_strftime), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, + { "strftime_mkdir", "create directory components in strftime-generated filename", OFFSET(use_strftime_mkdir), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, { "increment_tc", "increment timecode between each segment", OFFSET(increment_tc), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, { "break_non_keyframes", "allow breaking segments on non-keyframes", OFFSET(break_non_keyframes), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, E }, -- 2.36.2 diff --git a/doc/muxers.texi b/doc/muxers.texi index 4edbb22b00..77792379d9 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -2445,6 +2445,17 @@ segments to write. If this is selected, the output segment name must contain a @code{strftime} function template. Default value is @code{0}. +@item strftime_mkdir @var{1|0| +Used together with -strftime, it will create all subdirectories of the +expanded segment name. Default value is @code{0}. + +@example +ffmpeg -i in.nut -strftime 1 -strftime_mkdir 1 -hls_segment_filename '%Y/%m/%d/file-%Y%m%d-%s.ts' out.m3u8 +@end example +This example will create a directory hierarchy 2016/02/15 (if any of them do not exist), and then +produce the playlist, @file{out.m3u8}, and segment files: +@file{2016/02/15/file-20160215-1455569023.ts}, @file{2016/02/15/file-20160215-1455569024.ts}, etc. + @item break_non_keyframes @var{1|0} If enabled, allow segments to start on frames other than keyframes. This improves behavior on some players when the time between keyframes is diff --git a/libavformat/segment.c b/libavformat/segment.c index c904e20708..ef95b34beb 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -93,9 +93,11 @@ typedef struct SegmentContext { int list_type; ///< set the list type AVIOContext *list_pb; ///< list file put-byte context int64_t time; ///< segment duration - int use_strftime; ///< flag to expand filename with strftime int increment_tc; ///< flag to increment timecode if found + int use_strftime; ///< flag to expand filename with strftime + int use_strftime_mkdir; ///< flag to mkdir dirname in strftime filename + char *times_str; ///< segment times specification string int64_t *times; ///< list of segment interval specification int nb_times; ///< number of elments in the times array @@ -203,6 +205,19 @@ static int set_segment_filename(AVFormatContext *s)