[FFmpeg-devel] [PATCH] avformat: Add strftime_mkdir command line parameter to segment muxer

[FFmpeg-devel] [PATCH] avformat: Add strftime_mkdir command line parameter to segment muxer

[Emre Simsirli via ffmpeg-devel]

Adds strftime_mkdir parameter so that the parent directories defined in 
the segment name are correctly created. This makes the strftime 
functionality in 'segment' consistent with 'hls'.

Signed-off-by: Emre Simsirli <mail@emresimsirli.com>
---
  libavformat/segment.c | 16 ++++++++++++++++
  1 file changed, 16 insertions(+)

diff --git a/libavformat/segment.c b/libavformat/segment.c
index 2c7ba0e776..d84115ef3a 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -97,6 +97,7 @@ typedef struct SegmentContext {
      int64_t time;          ///< segment duration
      int64_t min_seg_duration;  ///< minimum segment duration
      int use_strftime;      ///< flag to expand filename with strftime
+    int use_strftime_mkdir; ///< flag to create parent directories with 
strftime_mkdir
      int increment_tc;      ///< flag to increment timecode if found
       char *times_str;       ///< segment times specification string
@@ -208,6 +209,20 @@ static int set_segment_filename(AVFormatContext *s)
              av_bprint_finalize(&filename, NULL);
              return AVERROR(ENOMEM);
          }
+
+        if (seg->use_strftime_mkdir) {
+            const char* dir;
+            char* fn_copy = av_strdup(filename.str);
+            if (!fn_copy)
+                return AVERROR(ENOMEM);
+            dir = av_dirname(fn_copy);
+            if (ff_mkdir_p(dir) == -1 && errno != EEXIST) {
+                av_log(s, AV_LOG_ERROR, "Could not create directory %s 
with use_strftime_mkdir\n", dir);
+                av_freep(&fn_copy);
+                return AVERROR(errno);
+            }
+            av_freep(&fn_copy);
+        }
      } else {
          ret = ff_bprint_get_frame_filename(&filename, s->url, 
seg->segment_idx, 0);
          if (ret < 0) {
@@ -1077,6 +1092,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 last 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 },
  -- 2.53.0

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org

[FFmpeg-devel] [PATCH v2 1/2] avformat: Add strftime_mkdir command line parameter to segment muxer

[Emre Simsirli via ffmpeg-devel]

Adds strftime_mkdir parameter so that the parent directories defined in the segment name are correctly created. This makes the strftime functionality in 'segment' consistent with 'hls'.

Signed-off-by: Emre Simsirli <mail@emresimsirli.com>
---
 libavformat/segment.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/libavformat/segment.c b/libavformat/segment.c
index 2c7ba0e776..d84115ef3a 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -97,6 +97,7 @@ typedef struct SegmentContext {
     int64_t time;          ///< segment duration
     int64_t min_seg_duration;  ///< minimum segment duration
     int use_strftime;      ///< flag to expand filename with strftime
+    int use_strftime_mkdir; ///< flag to create parent directories with strftime_mkdir
     int increment_tc;      ///< flag to increment timecode if found
 
     char *times_str;       ///< segment times specification string
@@ -208,6 +209,20 @@ static int set_segment_filename(AVFormatContext *s)
             av_bprint_finalize(&filename, NULL);
             return AVERROR(ENOMEM);
         }
+
+        if (seg->use_strftime_mkdir) {
+            const char* dir;
+            char* fn_copy = av_strdup(filename.str);
+            if (!fn_copy)
+                return AVERROR(ENOMEM);
+            dir = av_dirname(fn_copy);
+            if (ff_mkdir_p(dir) == -1 && errno != EEXIST) {
+                av_log(s, AV_LOG_ERROR, "Could not create directory %s with use_strftime_mkdir\n", dir);
+                av_freep(&fn_copy);
+                return AVERROR(errno);
+            }
+            av_freep(&fn_copy);
+        }
     } else {
         ret = ff_bprint_get_frame_filename(&filename, s->url, seg->segment_idx, 0);
         if (ret < 0) {
@@ -1077,6 +1092,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 last 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 },
 
-- 
2.53.0

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org

[FFmpeg-devel] [PATCH v2 2/2] doc: Update segment muxer options with strftime_mkdir

[Emre Simsirli via ffmpeg-devel]

Adds strftime_mkdir parameter explanation to the docs for the segment muxer.

Signed-off-by: Emre Simsirli <mail@emresimsirli.com>
---
 doc/muxers.texi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/muxers.texi b/doc/muxers.texi
index e1f737b1d9..36756949ee 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -3523,6 +3523,11 @@ 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 Used together with @code{strftime}, it will create all subdirectories
+which are present in the provided segment name function template.
+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
-- 
2.53.0

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org