From patchwork Mon Oct 10 10:14:59 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: 38652 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp285621pzb; Mon, 10 Oct 2022 03:15:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Ibayj6FeEMs2awVN+F+yRLakIwM0xVGf2vQHPhUBohqTqrXgNLfiEnGRNMEPuRqCr81Xd X-Received: by 2002:a17:907:3e85:b0:73d:60cc:5d06 with SMTP id hs5-20020a1709073e8500b0073d60cc5d06mr14352403ejc.722.1665396928288; Mon, 10 Oct 2022 03:15:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665396928; cv=none; d=google.com; s=arc-20160816; b=dGwA1QCDVcUqO2gqODm3QBb+NaBvQUixuA65OCLy4aaMJp4WdMQrvGfFu6Od/z6/gI G2HXClEz1PmknMCBw++jI2BQxrUNYjZ7TNvvxx1ZblN/yvWUeENKYaPyuyAxzXBtTft7 aWCT52yVi/Rmc6W/mfNUnpkUJh0WMUmpzq289RDIyaKI8XYMaO3suZFGB5wlitNcKCqq TwlrQS/oyIY/HwZgBjvw9A6q+FgDTONQhxXfLRcJNLE3Nf8ly7Sw1ZUCLD7Q3d+dsrgD Mh16uqIiNdTu+qvhXwAeKFQLQWjjvsN34uHam/hcR2+1HBY89mIPaUssOjOYVtJgK/XU lqFg== 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:mime-version:message-id:date:to:dkim-signature :from:delivered-to; bh=GZ/0J9XVVcrdur53dw1xeb7N5WupZ8jUmyAWxjGzd+w=; b=p9VC0+guUWHi7Uh9w/h8No5g1sY22e2arUEi++7/vmmlDA7IM+tqoMtYZCkAe+9XMj Q9GkhsmZsox6/V7kovOJL7C7SkCIFR3aL5tlrNvm5sKMKe+KGwxs9PVJoxjbBtze7IjA 1+vvUWeqIKU93mgGcZPXOkbN9A3RMts90cV45YQ5PztBhGNvOCDVO5mc8UWDJUv/P00k CtowFVsVUhEtAJ57K//eATBLlBg5R7DMFecHD7nupEDfv4ReOfaDx1FwABRPDO8xrP0I Z/3h9NeEcT6NET+QfNZK/tkv+ePIn0L0ofR1fbA3VKixQC6NjxxzyzFip2WrxhDFxAtj iM7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sx.gl header.s=mail header.b=qyHXMV3Y; 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 q22-20020a50c356000000b00458bb34ee93si9085627edb.149.2022.10.10.03.15.24; Mon, 10 Oct 2022 03:15:28 -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=qyHXMV3Y; 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 6459D68BCC4; Mon, 10 Oct 2022 13:15:21 +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 DF53668BAE1 for ; Mon, 10 Oct 2022 13:15:14 +0300 (EEST) From: George-Cristian Jiglau DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sx.gl; s=mail; t=1665396913; bh=kzC7Vg5y0JanmKdwW84W4jOysqTBvFGDtx7DCCctwu0=; h=From:To:Subject:Date; b=qyHXMV3YVDIzInQFtg9GUfZLDCY2i32aZ8Hn+EAN/KCOj6d9o9/ETfNs6ec4oIpSF SOvPps0Ut35GY0FGlCgpTIvGgUldSJh9akEkZhsj2KVzW39iklEdXp7DbEhFvJKAse z8VIfQ6j12Tpv4SBvB6zXSBepIiJuGO7kL8QeN5A= To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 13:14:59 +0300 Message-Id: <20221010101459.1781083-1-george@sx.gl> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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: J/0fr4o1bSuN This enables automatically creating directories for strftime-formatted segment names. Signed-off-by: George-Cristian Jiglau --- doc/muxers.texi | 4 ++++ libavformat/segment.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/doc/muxers.texi b/doc/muxers.texi index 4edbb22b00..96b63f4b9e 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -2445,6 +2445,10 @@ 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}. + @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..f75c7228f1 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -94,6 +94,7 @@ typedef struct SegmentContext { AVIOContext *list_pb; ///< list file put-byte context int64_t time; ///< segment duration int use_strftime; ///< flag to expand filename with strftime + int use_strftime_mkdir; ///< flag to mkdir dirname in strftime filename int increment_tc; ///< flag to increment timecode if found char *times_str; ///< segment times specification string @@ -203,6 +204,19 @@ static int set_segment_filename(AVFormatContext *s) 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 +1052,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 },