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 2CE4E40D82 for ; Mon, 27 Jan 2025 09:09:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6F54768BB30; Mon, 27 Jan 2025 11:09:43 +0200 (EET) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A347C6801DB for ; Mon, 27 Jan 2025 11:09:36 +0200 (EET) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-436341f575fso45012225e9.1 for ; Mon, 27 Jan 2025 01:09:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=datarhei.com; s=google; t=1737968975; x=1738573775; 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=pE68eryPeUDNcheQui8VYyUN5C1QVsEp7QplXqmoc2A=; b=O38gxIKEktn2Bl5E1LQR0zf6/Y327YOCWybsl4NNFdEBOEabx39Mqm+EJFv5ULwaR5 kdHUvaD+qAtr66/qiXA7zvEXhF4RA9m1DBhjraiplXEm8ePS2XQPzBqVqygdGsBoMlBa 7dPQv6kVjt7/vjiqrOi1RkfdoCvOfQFQ7eh1GG2DxNQ+obh/ws350FZ82Mb17bp6sBVC szFz/W+7lBT/eSjH9Fwem2ESUTlseaGV9A2izw5euUQXDK4SJsdPsNvDt0uyFeiMWk5Q DJyASzhTfpK/ZEGZuhGQK926kdkOw29BZv39QHr4nSo/GMRHVxrMJf8XlsjK27NVP6tR iCNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737968975; x=1738573775; 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=pE68eryPeUDNcheQui8VYyUN5C1QVsEp7QplXqmoc2A=; b=faSk7HIujfo+3sF3W4FxG/bdUCEwxiYorlvZ8ocHk5t5ApfRzO2Vb7gaXd0RnBssgM 7R7TqOL1EDLicdzpDGDgabMF/LKLnA9D/+kgJDQT9MBW1hXSBumKa8R265U+uP5c5TBt f6BIU1NFFbRM6FzqkVyRVWO5jqGgJrtu2uLGsxHPQ/7BJAadsqYHrfwByB85wlj7o4qV 3+vGi7T9Ucd4SN5XHLaox9mteBWn8LQUZrv+bZ60NlPsUqbje4oPcBIefbpTRkO7C0RT d/hN4/j6z/SPtzJ50pvh68gOrqNSwRQkfHwaeNmHyELKqdW4dnm2yHHo+bWK32db8i9g wN+A== X-Gm-Message-State: AOJu0Yz8xpubXrG/Cu0KaZ0z1CGK6Ozoe2oyD5MZelO/1PEyqyyEGNo0 5hHdoZaZkiDDoL5jFpAxfFPOTIW6s9ipSd1LGE39+NniSFzV+BSDUZ5EdeLHVcW3qRhrU2KlKDI = X-Gm-Gg: ASbGncv201Mn7VLK6pp8P3FZP0RHfibfQ2jhHnAG0PPMnSMwSRgblsCBrV8QeIr6XxH pKtLDpqn731Iaa0vnPCgkFI20hxkEJq7KHTmZtqDFLP6HUIZ3AEomY4AkvAyxiQ9781dnk9Lic1 u9aNFKgD8695rT6aRlnEGEOeHT/gQs/EpG7sYYg1jN1djhmy0MKXOnvT8Lr7eOaQ2/zW6GhzvLw wntJ3+l5WohFIFx7+g20uot1xJi0t3C4iNrsiClI7kTXRHHiEqfOGcryYjhef8YWZVyqUkt4+1K bDRyQUedZt+6gyqebTTuDVFasS2fJHJaAB1fm+ItJw== X-Google-Smtp-Source: AGHT+IE2AH2D2rhot0CDTAztAYI3OobfNM3MFY/S5/3XUWNWDDY6TOqYUGB6GXGpAkrq9+xRNfpipQ== X-Received: by 2002:a05:600c:3c82:b0:434:f5c0:329f with SMTP id 5b1f17b1804b1-438913f08a2mr405836365e9.14.1737968974581; Mon, 27 Jan 2025 01:09:34 -0800 (PST) Received: from localhost.localdomain ([2a04:ee41:4:b3b0:49c0:cd01:9cb2:8ed6]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438bd4b9a1bsm122637455e9.30.2025.01.27.01.09.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 27 Jan 2025 01:09:34 -0800 (PST) From: Ingo Oppermann To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Jan 2025 10:09:30 +0100 Message-Id: <20250127090930.52101-1-ingo@datarhei.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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. 30 seconds. After that, key frames will come every second. This will result in segments that are first 10 seconds (as expected), then 1 second for some time (not as expected) and later 2 seconds (as expected). How to reproduce: ffmpeg -t 30 -f lavfi -i testsrc2 -codec:v libx264 -g 250 part1.mp4 ffmpeg -t 30 -f lavfi -i testsrc2 -codec:v libx264 -g 25 part2.mp4 echo "file part1.mp4\nfile part2.mp4" > list.txt ffmpeg -f concat -i list.txt -codec copy \ -f hls -hls_time 2 -hls_list_size 0 parts.m3u8 cat parts.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: f632ab53d98168b9b731cf5696547c26059c0822 -- 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".