From patchwork Sun Jun 13 06:29:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Hardiman X-Patchwork-Id: 28260 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp1846808iol; Sat, 12 Jun 2021 23:30:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDi7sfzZgPHuRd839MOHQWyxSxWq9PARZagzxesGr34VVFtoHw+EsthkUCijDoEpzfLiy3 X-Received: by 2002:a17:907:62a5:: with SMTP id nd37mr481645ejc.148.1623565799887; Sat, 12 Jun 2021 23:29:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623565799; cv=none; d=google.com; s=arc-20160816; b=CcfM7qEkdXlY23vKtD7M/iY8Xc7jQfVn1kuVqGN4lURyJerYSNmvBcj9bCqT2cmRYL 64C2QPkT12iE53Xtjc+rB+sTD11pl1USoprl0bw1dRXjwgb8YJdhH40D4TRv3cIygM9E f7D4rM8i5MUG//6KF2PGb8Qxj4EBnwphxW9JWa86cgkYbNPnE15SfmNWs92jpd49ho/H ExbcSAs5HrmjYxz3cBC5oxIJzFVXQof3Rgnn9dyNmZP+jCpqOVaO10dWiuKWxg68rkd/ TRC0xeK7W7pcK/WjqCIlPrgtIATvsvJA6cHoRYf4LMcizmTgRO8tnHC34H1A9YIf92Hs dTGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=fzA7bEgye3ViskSpwBHyuspp45yrxO+F/i71WG5+UYI=; b=w15OWna98i18N71W5WaxVH7rhzX0IK+fm+5FKwQJpVuhsfyM319EU+F0qLALj2oOZF pFX5w25Kcfo2dAKOFw2Agnd1dJEauUCIwgU8XwZosdKtohRoXr8IMPPbcbj0lIl5e2LF eXKgZnvxVTIdzyhQ+WNJlwFibCu3bINR+JPOZrG3SroGiCa6mnkIJcqQwwUumaP3r5LZ 6Yolz4Uc+XGVZu4JtOXpG12eaW8ZDpbtLBjFS7u6v5aFE44UFvXe+m0+a5X1LdtdNgnO ruoqzLAqtoc/fh6xMVkRA+4X50czjnNl22X3T3d9FZ7wR/hmCrXHA9Ngefq77DxLlmsD h67Q== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s6si9176110ejs.567.2021.06.12.23.29.59; Sat, 12 Jun 2021 23:29:59 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 78C7E680677; Sun, 13 Jun 2021 09:29:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from p3plwbeout02-06.prod.phx3.secureserver.net (p3plsmtp02-06-2.prod.phx3.secureserver.net [72.167.218.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 087F1680677 for ; Sun, 13 Jun 2021 09:29:47 +0300 (EEST) Received: from mailex.mailcore.me ([94.136.40.145]) by :WBEOUT: with ESMTP id sJcolDAlRRSlFsJcpldreK; Sat, 12 Jun 2021 23:29:39 -0700 X-CMAE-Analysis: v=2.4 cv=A5+pg4aG c=1 sm=1 tr=0 ts=60c5a5d3 a=7e6w4QD8YWtpVJ/7+iiidw==:117 a=ts6lQOG229hm3yo+ZuYqAA==:17 a=3refzcEKTXMA:10 a=r6YtysWOX24A:10 a=Bll6aJoGAAAA:8 a=VmgfBN8s1OBxYg__DWwA:9 a=mfjboCOOu48Z1SWX:21 a=l-Qs3GcHMIxG1840:21 a=XyoGFFD3Jgho6_-SfTCd:22 X-SECURESERVER-ACCT: code@rjh.org.uk X-SID: sJcolDAlRRSlF Received: from [84.92.98.118] (helo=DellSilverSSD.lan) by smtp02.mailcore.me with esmtpa (Exim 4.94.2) (envelope-from ) id 1lsJcm-0004FB-LU; Sun, 13 Jun 2021 07:29:38 +0100 From: Roger Hardiman To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Jun 2021 07:29:07 +0100 Message-Id: <20210613062907.709-1-opensource@rjh.org.uk> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Mailcore-Auth: 440082631 X-Mailcore-Domain: 150451 X-123-reg-Authenticated: code@rjh.org.uk X-Originating-IP: 84.92.98.118 X-CMAE-Envelope: MS4xfK2CpklAdUvQTl8M5j82TktrgFDqc9rboCRVCqM5qSM95Ba/Ch9Z5V/Ph09TVJMpBESZkDVsH1YcepdzBhkGU1g0HMILyaIrPPsSEc+CRXDu4RUKg95N hD55AYonRcghIkDhC6dpzrotGYOE/wSjAcV86NWF4hbH7SW9Rfs8LlamgZNF9/c/L7zjn2K8cbwI9PZJm4h+8/BYi+5iNim5t68= Subject: [FFmpeg-devel] [PATCH] Add -strftime_mkdir to image2 and segment outputs (based on HLS). 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 Cc: Roger Hardiman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gxLevHBX8PnJ Add -strftime_mkdir to create any directories in the output file path for Image2 and Segment outputs. Based on existing function in HLS output. This allows strftime re-writes eg %Y %d %d (Year/Month/Day) and %H %M %S (Hours/Minutes/Seconds) to be used in the directory path of files ffmpeg creates. This makes organising the output of ffmpeg easier, for example creating folders with Year-Month-Day on the fly. Example output filename: /recordings/%Y_%m_%d/%H/video_%Y_%m_%d-%H_%M_%S.mp4 will expand to /recordings/2021_06_13/14/2021_06_13-14_01_50.mp4 with all the sub-directories created on the fly. Patch contains source code and documentation file changes. Signed-off-by: Roger Hardiman --- doc/muxers.texi | 16 +++++++++++++++- libavformat/img2enc.c | 15 +++++++++++++-- libavformat/internal.h | 8 ++++++++ libavformat/segment.c | 24 ++++++++++++++++++++---- libavformat/utils.c | 15 +++++++++++++++ 5 files changed, 71 insertions(+), 7 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index e77055e7ef..142b1864ea 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -907,7 +907,7 @@ is expanded in @var{filename}. @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 201560215 (if it does not exist), and then +This example will create a directory 20160215 (if it does not exist), and then produce the playlist, @file{out.m3u8}, and segment files: @file{20160215/file-20160215-1455569023.ts}, @file{20160215/file-20160215-1455569024.ts}, etc. @@ -1419,6 +1419,10 @@ overwritten with new images. Default value is 0. If set to 1, expand the filename with date and time information from @code{strftime()}. Default value is 0. +@item strftime_mkdir @var{1|0} +Used together with -strftime, when enabled it will create all subdirectories which +are expanded in @var{filename}. Default value is @code{0}. + @item protocol_opts @var{options_list} Set protocol options as a :-separated list of key=value parameters. Values containing the @code{:} special character must be escaped. @@ -2402,6 +2406,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, when enabled it will create all subdirectories which +are expanded in @var{filename}. 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 @@ -2484,6 +2492,12 @@ as live HLS source): ffmpeg -re -i in.mkv -codec copy -map 0 -f segment -segment_list playlist.m3u8 \ -segment_list_flags +live -segment_time 10 out%03d.mkv @end example + +@item +Segment an RTSP stream and create new output files every 60 seconds. Create new folders automatically with -strftime_mkdir: +@example +ffmpeg -i rtsp://192.168.1.195/h264 -f segment -segment_time 60 -strftime 1 -strftime_mkdir 1 -segment_format mp4 "/recordings/%Y-%m-%d/recording_%Y-%m-%d_%H-%M-%S.mp4" +@end example @end itemize @section smoothstreaming diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 7b5133d300..33d6d09b52 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -42,6 +42,7 @@ typedef struct VideoMuxData { char target[4][1024]; int update; int use_strftime; + int use_strftime_mkdir; int frame_pts; const char *muxer; int use_rename; @@ -130,6 +131,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) VideoMuxData *img = s->priv_data; AVIOContext *pb[4] = {0}; char filename[1024]; + char *fname; AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(par->format); int ret, i; @@ -166,8 +168,16 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) av_dict_copy(&options, img->protocol_opts, 0); snprintf(img->tmp[i], sizeof(img->tmp[i]), "%s.tmp", filename); av_strlcpy(img->target[i], filename, sizeof(img->target[i])); - if (s->io_open(s, &pb[i], img->use_rename ? img->tmp[i] : filename, AVIO_FLAG_WRITE, &options) < 0) { - av_log(s, AV_LOG_ERROR, "Could not open file : %s\n", img->use_rename ? img->tmp[i] : filename); + fname = (img->use_rename ? img->tmp[i] : filename); + if (img->use_strftime_mkdir) { + if ((ff_mkdir_filename(fname)) < 0) { + av_log(s, AV_LOG_ERROR, "Failed to create directory path for '%s'\n", fname); + ret = AVERROR(EIO); + goto fail; + } + } + if (s->io_open(s, &pb[i], fname, AVIO_FLAG_WRITE, &options) < 0) { + av_log(s, AV_LOG_ERROR, "Could not open file : %s\n", fname); ret = AVERROR(EIO); goto fail; } @@ -243,6 +253,7 @@ static const AVOption muxoptions[] = { { "update", "continuously overwrite one file", OFFSET(update), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC }, { "start_number", "set first number in the sequence", OFFSET(img_number), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, INT_MAX, ENC }, { "strftime", "use strftime for filename", OFFSET(use_strftime), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC }, + { "strftime_mkdir", "create directory components in strftime-generated filename", OFFSET(use_strftime_mkdir), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC }, { "frame_pts", "use current frame pts for filename", OFFSET(frame_pts), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC }, { "atomic_writing", "write files atomically (using temporary files and renames)", OFFSET(use_rename), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC }, { "protocol_opts", "specify protocol options for the opened files", OFFSET(protocol_opts), AV_OPT_TYPE_DICT, {0}, 0, 0, ENC }, diff --git a/libavformat/internal.h b/libavformat/internal.h index c6adf7b872..8795be43ba 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -430,6 +430,14 @@ do {\ */ int ff_mkdir_p(const char *path); +/** + * Automatically create sub-directories from a filename with a full path + * + * @param fn will create sub-directories required by the filename with a full path + * @return 0, or < 0 on error + */ +int ff_mkdir_filename(const char *fn); + char *ff_data_to_hex(char *buf, const uint8_t *src, int size, int lowercase); /** diff --git a/libavformat/segment.c b/libavformat/segment.c index 24490f1280..44d8de1dad 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -93,6 +93,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 timebased filename int increment_tc; ///< flag to increment timecode if found char *times_str; ///< segment times specification string @@ -248,6 +249,13 @@ static int segment_start(AVFormatContext *s, int write_header) if ((err = set_segment_filename(s)) < 0) return err; + if (seg->use_strftime_mkdir) { + if ((err = ff_mkdir_filename(oc->url)) < 0) { + av_log(s, AV_LOG_ERROR, "Failed to create directory path for '%s'\n", oc->url); + return err; + } + } + if ((err = s->io_open(s, &oc->pb, oc->url, AVIO_FLAG_WRITE, NULL)) < 0) { av_log(s, AV_LOG_ERROR, "Failed to open segment '%s'\n", oc->url); return err; @@ -674,6 +682,7 @@ static int seg_init(AVFormatContext *s) AVDictionary *options = NULL; int ret; int i; + char *filename; seg->segment_count = 0; if (!seg->write_header_trailer) @@ -756,10 +765,16 @@ static int seg_init(AVFormatContext *s) oc = seg->avf; if (seg->write_header_trailer) { - if ((ret = s->io_open(s, &oc->pb, - seg->header_filename ? seg->header_filename : oc->url, - AVIO_FLAG_WRITE, NULL)) < 0) { - av_log(s, AV_LOG_ERROR, "Failed to open segment '%s'\n", oc->url); + filename = (seg->header_filename ? seg->header_filename : oc->url); + if (seg->use_strftime_mkdir) { + if ((ret = ff_mkdir_filename(filename)) < 0) { + av_log(s, AV_LOG_ERROR, "Failed to create directory path for '%s'\n", filename); + return ret; + } + } + + if ((ret = s->io_open(s, &oc->pb, filename, AVIO_FLAG_WRITE, NULL)) < 0) { + av_log(s, AV_LOG_ERROR, "Failed to open segment '%s'\n", filename); return ret; } if (!seg->individual_header_trailer) @@ -1034,6 +1049,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 component 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 }, diff --git a/libavformat/utils.c b/libavformat/utils.c index 5582d108d0..7335f820be 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4745,6 +4745,21 @@ int ff_mkdir_p(const char *path) return ret; } +int ff_mkdir_filename(const char *fn) { + char *fn_copy = av_strdup(fn); + if (!fn_copy) + return AVERROR(ENOMEM); + else { + const char *dir = av_dirname(fn_copy); + if (ff_mkdir_p(dir) == -1 && errno != EEXIST) { + av_freep(&fn_copy); + return AVERROR(errno); + } + } + av_freep(&fn_copy); + return 0; +} + char *ff_data_to_hex(char *buff, const uint8_t *src, int s, int lowercase) { int i;