From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5EAB0478B1 for ; Fri, 27 Oct 2023 04:00:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EE2DA68CBED; Fri, 27 Oct 2023 07:00:05 +0300 (EEST) Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5199268CBE8 for ; Fri, 27 Oct 2023 06:59:59 +0300 (EEST) Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-41b7ec4cceeso11317521cf.1 for ; Thu, 26 Oct 2023 20:59:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698379197; x=1698983997; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=O9xCca8DHsfsqpBdmS8RTvan19a5FC1BbXzeQzbygfU=; b=MmgzBOfn2500UEoNEG/OPRQl6Gp4uuTNa72GenbAJ//AXngSqRkY0FgnLBXmcaZI2C y3+3Lur+RCPCsWKgecsMTw6aOPUu4i+djdjUdDUM4ecM2KIYDMG35DoFjKhmezhhFsy0 fwCbhkXR5RsKbz2O6wGr/CKmkLNknGyRCBdBFqfH9SbPvEG/B6WrNiwVdmvk0A405Ncn FcxxXciKMmSW+47u2/OsasJo2oGq86LKxtl7UFbJki96CZBXRcczp2wRsX43gweIexK+ o935U7L+Sisc1L6A7fbg+BBfkVCVak4ZxnqreZDkosXXVACSqwliKooTSH4qNcRbS4bz ncOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698379197; x=1698983997; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O9xCca8DHsfsqpBdmS8RTvan19a5FC1BbXzeQzbygfU=; b=dZ6/1DPqjSu+Mvb43RAYa7+fadyvYFQyEZjpWg6AmAgaTFHLFelsTreLEdSw9T/Xq4 /JqufqvsZOWmaTs1O8xX7nYOg34NPMMVKLc1bwA3/sEnQ1EuSBG6IddQ2eztlhaJW+WB mTT5DL5EcqzdSBtFCphlkxcxXdAcQ2SrbD5isgAPcEu/BSNSFNo/epaQjZhmg+W8vpxP jnjKRCNJXnK/mmdRU8qzYl5+wTWKAbDmF86kLdQ2Ls5CgmRrvyvs7U+MOLiij09hTXUn JgInIfiHllDVA6UyVj9ijwtbnOiDyUEtKbitnt5BPwRERmIqBPT2Kg7357EThBkFOvUe MAUA== X-Gm-Message-State: AOJu0YzGu7w7YoR1Fn8ec851NZCLFzJq5lzDJJQwvzFkSIQI6h41zGVs POwyWDl9X7nJGp2npqzYeV2dDshY4tAnUA== X-Google-Smtp-Source: AGHT+IGr30ybjucfUND226BxWVYT7r3UHbhwDh93ASK0WstN/FgsvM9sFoCgSh52o9i3AzDVq7H1Gw== X-Received: by 2002:ac8:5914:0:b0:41e:1c0d:35f9 with SMTP id 20-20020ac85914000000b0041e1c0d35f9mr1956267qty.30.1698379196962; Thu, 26 Oct 2023 20:59:56 -0700 (PDT) Received: from localhost.localdomain ([2605:a601:a98f:6200:f8bd:26eb:4d2d:1b2b]) by smtp.gmail.com with ESMTPSA id ey22-20020a056a0038d600b0069302c3c050sm364489pfb.218.2023.10.26.20.59.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 20:59:56 -0700 (PDT) From: Dave Johansen To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Oct 2023 21:59:41 -0600 Message-Id: <20231027035941.23491-4-davejohansen@gmail.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20231027035941.23491-1-davejohansen@gmail.com> References: <20231027035941.23491-1-davejohansen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/hlsenc: Add second_level_segment_microsecond for using %%f to specify microseconds of time in segment filename 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: Dave Johansen Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavformat/hlsenc.c | 51 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 93c47b631b..f613e35984 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -103,6 +103,7 @@ typedef enum HLSFlags { HLS_SECOND_LEVEL_SEGMENT_INDEX = (1 << 8), // include segment index in segment filenames when use_localtime e.g.: %%03d HLS_SECOND_LEVEL_SEGMENT_DURATION = (1 << 9), // include segment duration (microsec) in segment filenames when use_localtime e.g.: %%09t HLS_SECOND_LEVEL_SEGMENT_SIZE = (1 << 10), // include segment size (bytes) in segment filenames when use_localtime e.g.: %%014s + HLS_SECOND_LEVEL_SEGMENT_MICROSECOND = (1 << 15), // include microseconds of localtime in segment filenames when use_localtime e.g.: %%f HLS_TEMP_FILE = (1 << 11), HLS_PERIODIC_REKEY = (1 << 12), HLS_INDEPENDENT_SEGMENTS = (1 << 13), @@ -496,7 +497,7 @@ static int replace_str_data_in_filename(char **s, const char *filename, char pla return found_count; } -static int replace_int_data_in_filename(char **s, const char *filename, char placeholder, int64_t number) +static int replace_int_data_in_filename_forced(char **s, const char *filename, char placeholder, int64_t number, int forced_digits) { const char *p; char c; @@ -521,6 +522,9 @@ static int replace_int_data_in_filename(char **s, const char *filename, char pla nd = nd * 10 + *(p + addchar_count) - '0'; addchar_count++; } + if (forced_digits > nd) { + nd = forced_digits; + } if (*(p + addchar_count) == placeholder) { av_bprintf(&buf, "%0*"PRId64, (number < 0) ? nd : nd++, number); @@ -544,6 +548,11 @@ static int replace_int_data_in_filename(char **s, const char *filename, char pla return found_count; } +static int replace_int_data_in_filename(char **s, const char *filename, char placeholder, int64_t number) +{ + return replace_int_data_in_filename_forced(s, filename, placeholder, number, 0); +} + static void write_styp(AVIOContext *pb) { avio_wb32(pb, 24); @@ -1020,6 +1029,20 @@ static int sls_flags_filename_process(struct AVFormatContext *s, HLSContext *hls } ff_format_set_url(vs->avf, filename); } + if (hls->flags & HLS_SECOND_LEVEL_SEGMENT_MICROSECOND) { + char *filename = NULL; + double mod_res; + if (replace_int_data_in_filename_forced(&filename, vs->avf->url, + 'f', 1000000 * modf(vs->curr_prog_date_time, &mod_res), 6) < 1) { + av_log(hls, AV_LOG_ERROR, + "Invalid second level segment filename template '%s', " + "you can try to remove second_level_segment_microsecond flag\n", + vs->avf->url); + av_freep(&filename); + return AVERROR(EINVAL); + } + ff_format_set_url(vs->avf, filename); + } } return 0; } @@ -1043,6 +1066,11 @@ static int sls_flag_check_duration_size_index(HLSContext *hls) "second_level_segment_index hls_flag requires strftime to be true\n"); ret = AVERROR(EINVAL); } + if (hls->flags & HLS_SECOND_LEVEL_SEGMENT_MICROSECOND) { + av_log(hls, AV_LOG_ERROR, + "second_level_segment_microsecond hls_flag requires strftime to be true\n"); + ret = AVERROR(EINVAL); + } return ret; } @@ -1063,12 +1091,17 @@ static int sls_flag_check_duration_size(HLSContext *hls, VariantStream *vs) "second_level_segment_size hls_flag works only with file protocol segment names\n"); ret = AVERROR(EINVAL); } + if ((hls->flags & HLS_SECOND_LEVEL_SEGMENT_MICROSECOND) && !segment_renaming_ok) { + av_log(hls, AV_LOG_ERROR, + "second_level_segment_microsecond hls_flag works only with file protocol segment names\n"); + ret = AVERROR(EINVAL); + } return ret; } static void sls_flag_file_rename(HLSContext *hls, VariantStream *vs, char *old_filename) { - if ((hls->flags & (HLS_SECOND_LEVEL_SEGMENT_SIZE | HLS_SECOND_LEVEL_SEGMENT_DURATION)) && + if ((hls->flags & (HLS_SECOND_LEVEL_SEGMENT_SIZE | HLS_SECOND_LEVEL_SEGMENT_DURATION | HLS_SECOND_LEVEL_SEGMENT_MICROSECOND)) && strlen(vs->current_segment_final_filename_fmt)) { ff_rename(old_filename, vs->avf->url, hls); } @@ -1088,7 +1121,7 @@ static int sls_flag_use_localtime_filename(AVFormatContext *oc, HLSContext *c, V } ff_format_set_url(oc, filename); } - if (c->flags & (HLS_SECOND_LEVEL_SEGMENT_SIZE | HLS_SECOND_LEVEL_SEGMENT_DURATION)) { + if (c->flags & (HLS_SECOND_LEVEL_SEGMENT_SIZE | HLS_SECOND_LEVEL_SEGMENT_DURATION | HLS_SECOND_LEVEL_SEGMENT_MICROSECOND)) { av_strlcpy(vs->current_segment_final_filename_fmt, oc->url, sizeof(vs->current_segment_final_filename_fmt)); if (c->flags & HLS_SECOND_LEVEL_SEGMENT_SIZE) { @@ -1113,6 +1146,17 @@ static int sls_flag_use_localtime_filename(AVFormatContext *oc, HLSContext *c, V } ff_format_set_url(oc, filename); } + if (c->flags & HLS_SECOND_LEVEL_SEGMENT_MICROSECOND) { + char *filename = NULL; + if (replace_int_data_in_filename(&filename, oc->url, 'f', 0) < 1) { + av_log(c, AV_LOG_ERROR, "Invalid second level segment filename template '%s', " + "you can try to remove second_level_segment_microsecond flag\n", + oc->url); + av_freep(&filename); + return AVERROR(EINVAL); + } + ff_format_set_url(oc, filename); + } } return 0; } @@ -3176,6 +3220,7 @@ static const AVOption options[] = { {"second_level_segment_index", "include segment index in segment filenames when use_localtime", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_SECOND_LEVEL_SEGMENT_INDEX }, 0, UINT_MAX, E, "flags"}, {"second_level_segment_duration", "include segment duration in segment filenames when use_localtime", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_SECOND_LEVEL_SEGMENT_DURATION }, 0, UINT_MAX, E, "flags"}, {"second_level_segment_size", "include segment size in segment filenames when use_localtime", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_SECOND_LEVEL_SEGMENT_SIZE }, 0, UINT_MAX, E, "flags"}, + {"second_level_segment_microsecond", "include microseconds of localtime in segment filenames when use_localtime", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_SECOND_LEVEL_SEGMENT_MICROSECOND }, 0, UINT_MAX, E, "flags"}, {"periodic_rekey", "reload keyinfo file periodically for re-keying", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_PERIODIC_REKEY }, 0, UINT_MAX, E, "flags"}, {"independent_segments", "add EXT-X-INDEPENDENT-SEGMENTS, whenever applicable", 0, AV_OPT_TYPE_CONST, { .i64 = HLS_INDEPENDENT_SEGMENTS }, 0, UINT_MAX, E, "flags"}, {"iframes_only", "add EXT-X-I-FRAMES-ONLY, whenever applicable", 0, AV_OPT_TYPE_CONST, { .i64 = HLS_I_FRAMES_ONLY }, 0, UINT_MAX, E, "flags"}, -- 2.39.2 (Apple Git-143) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".