From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 5AD4D4EA3A
for <ffmpegdev@gitmailbox.com>; Sat, 14 Jun 2025 00:12:45 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id CC3DA68CC88;
Sat, 14 Jun 2025 03:12:41 +0300 (EEST)
Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com
[209.85.215.175])
by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 2691F68C009
for <ffmpeg-devel@ffmpeg.org>; Sat, 14 Jun 2025 03:12:35 +0300 (EEST)
Received: by mail-pg1-f175.google.com with SMTP id
41be03b00d2f7-b2d46760950so2767540a12.3
for <ffmpeg-devel@ffmpeg.org>; Fri, 13 Jun 2025 17:12:35 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1749859953; x=1750464753; darn=ffmpeg.org;
h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date
:references:in-reply-to:message-id:from:from:to:cc:subject:date
:message-id:reply-to;
bh=Ein061pQnQ2T6+/QeY6bIPkk8VOLnbJ+Yzl6OoRMLOA=;
b=TNFAfzYAhukQHtTPwMPhgrhFwWEGNMbp5ekX7QmouDm1FWu+1+cjVhGVDO6MF0ocDB
6hBnqnzOzlScR+9Xzw/aZeioNnJvfDPd2vo6iNOicEAONAGgx1VGVDCtJV0pKMW9AZBT
dcIPMF9HP/61cZWwfkgSO3tOhkm7BwOlrRHCI3aag0fbpZrHKu70uD65728vB84w1QcO
GjOSPJ24xiTipyVO883M0rLvRBMR5v77UEdjbZNFL/fD2eVplce50iLQERI1Uv3FTJbz
7AUMti5gtVjNisCEIuIn08IXq3x9Yr8fbcPCfyRRC2xwRoXVQbJg5ag7SDhLZFR85+WF
YJjw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1749859953; x=1750464753;
h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date
:references:in-reply-to:message-id:from:x-gm-message-state:from:to
:cc:subject:date:message-id:reply-to;
bh=Ein061pQnQ2T6+/QeY6bIPkk8VOLnbJ+Yzl6OoRMLOA=;
b=AerzHqn+O4wRPYt2OEA7+eoWKp2WksZdQa6qGdnq2xEHmvHNWBQUO0VXA1gTPQrIY0
3fgCbCZl+ulaQ5GQ5yEc9CpBSE0jIVZzuUrrVlqf28XifQbU3pZoHt+vJuiM/wUqNfoF
B7ykkieQBsnr8Q6ELBHcMhik/iTFZQmcUzKy5serVmI7NncWT1iGF4hhK4hyWC8Bmx4K
frVLuCkzrO774d5e1AA6tpszF+O7bYIj5CSTe186GHlqyhGR974Cw+Yc8GPNrgYWf1NY
R2+bL2s3ekZoKtq/+IygYz4m9orRafVFhJYDfBi3M0rRhzBopPdv/mI1oQqRAozxEW43
kKJw==
X-Gm-Message-State: AOJu0YyWKapEDzzJrRnwu0LhzAycpA1buhQuOxtlIJY99KC7htCTxQdS
TA5ps/59KrG6MtmLNvxoMzwKiNbwfQOmytKeIdNFtlt9yUwBZlGln2b0QsRRpg==
X-Gm-Gg: ASbGncvAGti4zujhvHVEIfa2KhUMdBJB377/uTNF1INctai0/H3FDyy07rL6UfH6246
ZLhl/sU7kyyoSYYeYvFvEesiCFfpLJYQlStMroACuxmErh9N3R2Xa9P0nNSHkORqhmWTuM34o3V
RLsECFnEZ9bEYk/jjggECxE0v6XnEMrafg5PkliPfa5HOaGzZd4UnpMimawAECGeLNsnbdMym9A
ua/VsftwOttKDC6290/jAHWr/l3jzWLvlcT0vp9MiJiDToIl7foz+GqdIaPxFjdA1MVK0Eo9fDv
IwVq6AAdpJkBNt/6hMRYPEqa1m7aMeIQqJpLXXdjijKoqL2SCzse6FIGHkJP2kBGS1w2/ofuIQ4
C7Uo9
X-Google-Smtp-Source: AGHT+IFxzjuh6v/zANLPyZJQXAEJDr2HzKKwxXVA1WYYsZEpDtRDk0aXwSsxbDYRad+ZXAlbuOp8UQ==
X-Received: by 2002:a05:6a21:4a4a:b0:1fe:90c5:7d00 with SMTP id
adf61e73a8af0-21fbd68bb22mr1696647637.28.1749859953060;
Fri, 13 Jun 2025 17:12:33 -0700 (PDT)
Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50])
by smtp.gmail.com with ESMTPSA id
41be03b00d2f7-b2fe168987esm2385780a12.57.2025.06.13.17.12.32
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Fri, 13 Jun 2025 17:12:32 -0700 (PDT)
From: softworkz <ffmpegagent-at-gmail.com@ffmpeg.org>
X-Google-Original-From: softworkz <softworkz@hotmail.com>
Message-Id: <pull.97.v2.ffstaging.FFmpeg.1749859946978.ffmpegagent@gmail.com>
In-Reply-To: <pull.97.ffstaging.FFmpeg.1749835195.ffmpegagent@gmail.com>
References: <pull.97.ffstaging.FFmpeg.1749835195.ffmpegagent@gmail.com>
Date: Sat, 14 Jun 2025 00:12:26 +0000
Fcc: Sent
MIME-Version: 1.0
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH v2] avformat/hlsenc: Fix path handling for
Windows
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: softworkz <softworkz@hotmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/pull.97.v2.ffstaging.FFmpeg.1749859946978.ffmpegagent@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
From: softworkz <softworkz@hotmail.com>
Signed-off-by: softworkz <softworkz@hotmail.com>
---
avformat/hlsenc: Some HLS improvements
Includes only a single patch now:
* Fix path handling on Windows
Versions
========
V2
==
* Fix path handling for Windows;
* Keep using av_asprintf() with "%*s" to limit the length (as per
review by Marton - thanks!)
* Use int64:_t instead of int
* Removed logging patches
.
Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-97%2Fsoftworkz%2Fsubmit_hls_logging-v2
Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-97/softworkz/submit_hls_logging-v2
Pull-Request: https://github.com/ffstaging/FFmpeg/pull/97
Range-diff vs v1:
1: 58988164f2 < -: ---------- avformat/hlsenc: Log information about segments written
2: 1a4268d7e1 < -: ---------- avformat/hlsenc: Log InitFileComplete message
3: 99dfda2420 ! 1: 93e1a502be avformat/hlsenc: Fix path handling for Windows
@@ libavformat/hlsenc.c: static int hlsenc_io_close(AVFormatContext *s, AVIOContext
return ret;
}
-+static int get_last_separator_pos(const char *path)
++static int64_t get_last_separator_pos(const char *path)
+{
+ if (!path || *path == '\0')
+ return -1;
@@ libavformat/hlsenc.c: static int hls_rename_temp_file(AVFormatContext *s, AVForm
- size_t base_len = 0;
-
- if (!p) p = strrchr(master_url, '\\');
-+ int pos = get_last_separator_pos(master_url);
++ int64_t pos = get_last_separator_pos(master_url);
- if (p) {
- base_len = p - master_url;
@@ libavformat/hlsenc.c: static int hls_init(AVFormatContext *s)
- char tmp = *(++p);
- *p = '\0';
- vs->base_output_dirname = av_asprintf("%s%s", vs->m3u8_name,
-- vs->fmp4_init_filename);
-- *p = tmp;
-+ int pos = get_last_separator_pos(vs->m3u8_name);
++ int64_t pos = get_last_separator_pos(vs->m3u8_name);
+ if (pos >= 0) {
-+ AVBPrint buf;
-+ av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
-+ av_bprint_append_data(&buf, vs->m3u8_name, pos + 1);
-+ av_bprintf(&buf, "%s", vs->fmp4_init_filename);
-+ av_bprint_finalize(&buf, &vs->base_output_dirname);
++ vs->base_output_dirname = av_asprintf("%.*s%s", pos + 1, vs->m3u8_name,
+ vs->fmp4_init_filename);
+- *p = tmp;
} else {
vs->base_output_dirname = av_strdup(vs->fmp4_init_filename);
}
libavformat/hlsenc.c | 38 ++++++++++++++++++++++++--------------
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index a93d35ab75..965ed9c1c0 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -329,6 +329,23 @@ static int hlsenc_io_close(AVFormatContext *s, AVIOContext **pb, char *filename)
return ret;
}
+static int64_t get_last_separator_pos(const char *path)
+{
+ if (!path || *path == '\0')
+ return -1;
+
+ char *p = strrchr(path, '/');
+#if HAVE_DOS_PATHS
+ char *q = strrchr(path, '\\');
+ p = FFMAX(p, q);
+#endif
+
+ if (!p)
+ return -1;
+
+ return p - path;
+}
+
static void set_http_options(AVFormatContext *s, AVDictionary **options, HLSContext *c)
{
int http_base_proto = ff_is_http_proto(s->url);
@@ -1408,14 +1425,10 @@ static int hls_rename_temp_file(AVFormatContext *s, AVFormatContext *oc)
static const char* get_relative_url(const char *master_url, const char *media_url)
{
- const char *p = strrchr(master_url, '/');
- size_t base_len = 0;
-
- if (!p) p = strrchr(master_url, '\\');
+ int64_t pos = get_last_separator_pos(master_url);
- if (p) {
- base_len = p - master_url;
- if (av_strncasecmp(master_url, media_url, base_len)) {
+ if (pos >= 0) {
+ if (av_strncasecmp(master_url, media_url, pos)) {
av_log(NULL, AV_LOG_WARNING, "Unable to find relative url\n");
return NULL;
}
@@ -1423,7 +1436,7 @@ static const char* get_relative_url(const char *master_url, const char *media_ur
return media_url;
}
- return media_url + base_len + 1;
+ return media_url + pos + 1;
}
static int64_t get_stream_bit_rate(AVStream *stream)
@@ -3142,13 +3155,10 @@ static int hls_init(AVFormatContext *s)
vs->fmp4_init_filename = expanded;
}
- p = strrchr(vs->m3u8_name, '/');
- if (p) {
- char tmp = *(++p);
- *p = '\0';
- vs->base_output_dirname = av_asprintf("%s%s", vs->m3u8_name,
+ int64_t pos = get_last_separator_pos(vs->m3u8_name);
+ if (pos >= 0) {
+ vs->base_output_dirname = av_asprintf("%.*s%s", pos + 1, vs->m3u8_name,
vs->fmp4_init_filename);
- *p = tmp;
} else {
vs->base_output_dirname = av_strdup(vs->fmp4_init_filename);
}
base-commit: f3bf5356966b4ad9334034e720fa224c2d9464a6
--
ffmpeg-codebot
_______________________________________________
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".