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 ESMTPS id EE0764C829 for ; Fri, 24 Jan 2025 11:59:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0D0F368B80B; Fri, 24 Jan 2025 13:59:23 +0200 (EET) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44D4E68B0F4 for ; Fri, 24 Jan 2025 13:59:16 +0200 (EET) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-436345cc17bso14339905e9.0 for ; Fri, 24 Jan 2025 03:59:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=datarhei.com; s=google; t=1737719954; x=1738324754; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=E1nJeqqJcQYRicumYcWIyvN2xLVN3vX57HgUEyTp9nk=; b=XT7fsHLMfTzbM6PHFZsAeSoCuDxtQfuQ4whsoKrU0OewwM9E/xqoxzmXESzERp0iI6 EfCuULcaR1OrI+ygrMxt7bjf2A5zTe2IRe5JsYZgJ9wCkjvsrZ3e3s1qALG/YJEyhJL2 cxpkodwAim1gYOfVbHNgeGP7EmNs1fXQtnAJJK2BMEi0ZKPANmqgF4Hj7cFzGsBRpD6t rQa8F7TPTt4iYsSAIAvvL+t6kxZ6DOxUyc/4+3BglBv95QfKrqvJMwA8oxNfuue8Eu3T GTLSVYgK7lKyRkXC9yk0jkEsQgwrnRG9hV9Xbc4rYfq9omk0qTTXWR0grq6bwydrwxt5 pMTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737719954; x=1738324754; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=E1nJeqqJcQYRicumYcWIyvN2xLVN3vX57HgUEyTp9nk=; b=lxUqWk6/gH3tHEq26KAVpDv0nakK93/5QY5EAr7sJOHfBVX12MFHGbV7LifmkMPfyR SlB183fmqHTMmtiINBU/DYBFK1JJoekYbeOe7OuA5RJO4Yhe4QOx2r1rvN7/KliLo6R+ uHLVqgoiOqljRJc2iJRnv+RWNs/+OIE/FOYX6IdVqKdsdpYOOa6lwFdY1iCJvNBqEy7V vl60xeMarT7YRZUck/YnQITrmrB35ySxcC6cxReRwTZ3ZSw31ajEoBhU/tT2D4uDljiB fTJlc1RUaEmrWeMILqppE5iu+lxDvsDna1t0vluIU0m0h5Hb1Uv+Mv6kenOTB//8n25B 0trQ== X-Gm-Message-State: AOJu0Yw1vV+0at2dPvndcj3Uq62Qq9P97i6pZKzo/WljwKl3dtp6Hqrw OG/GD9dZ2i2G3MSBxdXS5omyjnSKDwDC+YKrd8D66G+rpWIR5ls8OFUREGUni3K42qZRnLvqb/I = X-Gm-Gg: ASbGncsY4htJGiqMrk6vN+RoEU8ncfbrYpewnaPywm2W5pDVw4R1uLiFuPFluL1VtBy crq4U3s9gzCfyCSkBMeJdIcS08E6QUvBObz0wQIicWdUJPvqmAX5F2JVZCi+rkuhm3ChsqlAM3Y Vd/C9FVUC2ILM+8YcqD4UtNiLtYvRUoYr2D6Gv3x6nCwibo5KG1tck8CTyltMl+7/8PBQ6KyHx0 wGFtyx268o26TDPfL7dreWlpBx40K9Ff27yfvzZ26YL2Xwpw0tQp+Fnu3CbhOulB76MsDHnFzTV solijKN852IlBjRyULxasdSlB373alY= X-Google-Smtp-Source: AGHT+IE8/DaSYiBFa+GLt6mHBLlXiljDrkDf5nd00aATwqT9FUaTSlJ6GxT3Fcmp12hXDvscITXmPw== X-Received: by 2002:a05:600c:138a:b0:435:194:3cdf with SMTP id 5b1f17b1804b1-438914292demr269942745e9.19.1737719954158; Fri, 24 Jan 2025 03:59:14 -0800 (PST) Received: from localhost.localdomain ([2a04:ee41:4:b3b0:49c0:cd01:9cb2:8ed6]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c2a1bb0d4sm2539905f8f.69.2025.01.24.03.59.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 24 Jan 2025 03:59:13 -0800 (PST) From: Ingo Oppermann To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Jan 2025 12:59:10 +0100 Message-Id: <20250124115910.3550-1-ingo@datarhei.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1] avformat/hlsenc: fix hls_time not respected 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: Ingo Oppermann 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: This fixes the criterion when to split the segments based on the elapsed time for the current segment instead of using the theoretical elapsed time since start based on hls_time and the number of written segments. hls_time is used to define the minimum length of a segment, however this is not respected in all cases when a stream has variable GOP sizes. Imagine a stream starts with a key frame every 10 seconds for e.g. 40 seconds. After that, key frames will come every second. This will result in segments that are first 10 seconds, then 1 second for some time and later 2 seconds as expected. How to reproduce: ffmpeg -t 40 -f lavfi -i testsrc2=s=1280x720:r=25 -codec:v libx264 -g 250 part1.mp4 ffmpeg -t 40 -f lavfi -i testsrc2=s=1280x720:r=25 -codec:v libx264 -g 25 part2.mp4 echo "file part1.mp4\nfile part2.mp4" > list.txt ffmpeg -f concat -i list.txt -codec copy part.mp4 ffmpeg -i part.mp4 -codec copy -f hls -hls_time 2 -hls_list_size 0 -hls_segment_filename 'part_%d.ts' part.m3u8 cat part.m3u8 Signed-off-by: Ingo Oppermann --- libavformat/hlsenc.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 6148685f40..2c5d60500d 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2474,7 +2474,6 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) HLSContext *hls = s->priv_data; AVFormatContext *oc = NULL; AVStream *st = s->streams[pkt->stream_index]; - int64_t end_pts = 0; int is_ref_pkt = 1; int ret = 0, can_split = 1, i, j; int stream_index = 0; @@ -2512,14 +2511,9 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR(ENOMEM); } - end_pts = hls->recording_time * vs->number; - if (vs->sequence - vs->nb_entries > hls->start_sequence && hls->init_time > 0) { - /* reset end_pts, hls->recording_time at end of the init hls list */ - int64_t init_list_dur = hls->init_time * vs->nb_entries; - int64_t after_init_list_dur = (vs->sequence - hls->start_sequence - vs->nb_entries) * hls->time; + /* reset hls->recording_time at end of the init hls list */ hls->recording_time = hls->time; - end_pts = init_list_dur + after_init_list_dur ; } if (vs->start_pts == AV_NOPTS_VALUE) { @@ -2560,8 +2554,8 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) } can_split = can_split && (pkt->pts - vs->end_pts > 0); - if (vs->packets_written && can_split && av_compare_ts(pkt->pts - vs->start_pts, st->time_base, - end_pts, AV_TIME_BASE_Q) >= 0) { + if (vs->packets_written && can_split && av_compare_ts(pkt->pts - vs->end_pts, st->time_base, + hls->recording_time, AV_TIME_BASE_Q) >= 0) { int64_t new_start_pos; int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0); double cur_duration; base-commit: e20ee9f9aec94f8cea1bf4fd8ed3fb096fb205e5 -- 2.39.5 (Apple Git-154) _______________________________________________ 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".