Commit 8814ef4412 for ffmpeg
commit 8814ef4412a9d3ddc5d99222a46ce94fb7c05765
Author: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date: Mon Nov 2 23:43:32 2026 -0800
avformat/hlsenc: keep early fragments out of fMP4 init data
Automatic MP4 fragment cuts can write media before the first HLS segment boundary. Record the end of the initial moov in the MOV muxer and use that boundary to separate initialization data from media, retaining early fragments for the first HLS segment.
Share initialization handling between normal segmentation and the trailer, and add FATE coverage for both paths.
Signed-off-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index e35af34d23..f2a26fc302 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -53,9 +53,7 @@
#include "hlsplaylist.h"
#include "internal.h"
#include "mux.h"
-#if CONFIG_MP4_MUXER
#include "movenc.h"
-#endif
#include "os_support.h"
#include "url.h"
@@ -505,6 +503,53 @@ static void reflush_dynbuf(VariantStream *vs, int *range_length)
avio_write(vs->out, vs->temp_buffer, *range_length);
}
+static int hls_write_init_file(AVFormatContext *s, VariantStream *vs)
+{
+ HLSContext *hls = s->priv_data;
+ AVFormatContext *oc = vs->avf;
+ const MOVMuxContext *mov = oc->priv_data;
+ int64_t init_size = mov->moov_end;
+ AVIOContext *media_pb;
+ uint8_t *buffer, *init_buffer = NULL;
+ int buffer_size, ret;
+
+ buffer_size = avio_get_dyn_buf(oc->pb, &buffer);
+ if (oc->pb->error < 0)
+ return oc->pb->error;
+ if (init_size <= 0 || init_size > buffer_size)
+ return AVERROR_INVALIDDATA;
+
+ /* Automatic fragment cuts may have already written media after moov.
+ * Preserve the original buffer until all split allocations succeed. */
+ if ((ret = avio_open_dyn_buf(&media_pb)) < 0)
+ return ret;
+ avio_write(media_pb, buffer + init_size, buffer_size - init_size);
+ avio_flush(media_pb);
+ if (media_pb->error < 0) {
+ ret = media_pb->error;
+ goto fail;
+ }
+ if (hls->resend_init_file) {
+ init_buffer = av_memdup(buffer, init_size);
+ if (!init_buffer) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ }
+
+ avio_write(vs->out, buffer, init_size);
+ ffio_free_dyn_buf(&oc->pb);
+ oc->pb = media_pb;
+ vs->init_buffer = init_buffer;
+ vs->init_range_length = init_size;
+ vs->start_pos = init_size;
+ return 0;
+
+fail:
+ ffio_free_dyn_buf(&media_pb);
+ return ret;
+}
+
static int hls_delete_file(HLSContext *hls, AVFormatContext *avf,
char *path, const char *proto)
{
@@ -2540,23 +2585,12 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt)
new_start_pos = avio_tell(oc->pb);
vs->size = new_start_pos - vs->start_pos;
avio_flush(oc->pb);
- if (hls->segment_type == SEGMENT_TYPE_FMP4) {
- if (!vs->init_range_length) {
- range_length = avio_close_dyn_buf(oc->pb, &vs->init_buffer);
- oc->pb = NULL;
- if (range_length <= 0)
- return AVERROR(EINVAL);
- avio_write(vs->out, vs->init_buffer, range_length);
- if (!hls->resend_init_file)
- av_freep(&vs->init_buffer);
- vs->init_range_length = range_length;
- avio_open_dyn_buf(&oc->pb);
- vs->packets_written = 0;
- vs->start_pos = range_length;
- if (!byterange_mode) {
- hlsenc_io_close(s, &vs->out, vs->base_output_dirname);
- }
- }
+ if (hls->segment_type == SEGMENT_TYPE_FMP4 && !vs->init_range_length) {
+ ret = hls_write_init_file(s, vs);
+ if (ret < 0)
+ return ret;
+ if (!byterange_mode)
+ hlsenc_io_close(s, &vs->out, vs->base_output_dirname);
}
if (!byterange_mode) {
if (vs->vtt_avf) {
@@ -2793,23 +2827,16 @@ static int hls_write_trailer(struct AVFormatContext *s)
return AVERROR(ENOMEM);
}
- if (hls->segment_type == SEGMENT_TYPE_FMP4) {
- if (!vs->init_range_length) {
- uint8_t *buffer = NULL;
- av_write_frame(oc, NULL); /* Flush any buffered data */
-
- int init_range_length = avio_close_dyn_buf(oc->pb, &buffer);
- avio_write(vs->out, buffer, init_range_length);
- av_freep(&buffer);
- vs->init_range_length = init_range_length;
- avio_open_dyn_buf(&oc->pb);
- vs->packets_written = 0;
- vs->start_pos = init_range_length;
- byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0);
- if (!byterange_mode) {
- ff_format_io_close(s, &vs->out);
- hlsenc_io_close(s, &vs->out, vs->base_output_dirname);
- }
+ if (hls->segment_type == SEGMENT_TYPE_FMP4 && !vs->init_range_length) {
+ av_write_frame(oc, NULL); /* Flush any buffered data */
+
+ ret = hls_write_init_file(s, vs);
+ if (ret < 0)
+ goto failed;
+ byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0);
+ if (!byterange_mode) {
+ ff_format_io_close(s, &vs->out);
+ hlsenc_io_close(s, &vs->out, vs->base_output_dirname);
}
}
if (!(hls->flags & HLS_SINGLE_FILE)) {
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 8826337b16..ae19000811 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -6931,6 +6931,7 @@ static int mov_flush_fragment(AVFormatContext *s, int force)
mov_write_identification(s->pb, s);
if ((ret = mov_write_moov_tag(s->pb, mov, s)) < 0)
return ret;
+ mov->moov_end = avio_tell(s->pb);
if (mov->flags & FF_MOV_FLAG_DELAY_MOOV) {
if (mov->flags & FF_MOV_FLAG_GLOBAL_SIDX)
@@ -9148,6 +9149,7 @@ static int mov_write_header(AVFormatContext *s)
if ((ret = mov_write_moov_tag(pb, mov, s)) < 0)
return ret;
mov->moov_written = 1;
+ mov->moov_end = avio_tell(pb);
if (mov->flags & FF_MOV_FLAG_GLOBAL_SIDX)
mov->reserved_header_pos = avio_tell(pb);
}
diff --git a/libavformat/movenc.h b/libavformat/movenc.h
index c375659c93..004b37fa57 100644
--- a/libavformat/movenc.h
+++ b/libavformat/movenc.h
@@ -228,6 +228,7 @@ typedef struct MOVMuxContext {
int iods_audio_profile;
int moov_written;
+ int64_t moov_end; ///< End of the initial moov atom.
int fragments;
int max_fragment_duration;
int min_fragment_duration;
diff --git a/tests/fate/hlsenc.mak b/tests/fate/hlsenc.mak
index b52d306726..f57275d79e 100644
--- a/tests/fate/hlsenc.mak
+++ b/tests/fate/hlsenc.mak
@@ -314,6 +314,29 @@ fate-hls-sched-extaudio: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -bitexact -thread
$(TARGET_PATH)/tests/data/hls_sched_extaudio_0.ts
fate-hls-sched-extaudio: CMP = diff
+# Keyframes inside an HLS segment must not become part of EXT-X-MAP.
+# A segment longer than the input exercises initialization in the trailer.
+tests/data/hls_fmp4_frag_keyframe.m3u8 tests/data/hls_fmp4_frag_keyframe_short.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
+ $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \
+ -f lavfi -i "testsrc2=size=128x72:rate=2:d=3" -map 0:v \
+ -c:v mpeg2video -g 1 -bitexact -dct int -f hls \
+ -hls_time $(if $(findstring short,$@),10,2) -hls_list_size 0 \
+ -hls_segment_type fmp4 -hls_flags single_file \
+ -hls_segment_options movflags=+cmaf+frag_keyframe \
+ -hls_segment_filename $(TARGET_PATH)/$(@:.m3u8=.mp4) \
+ $(TARGET_PATH)/$@ 2>/dev/null
+
+FATE_HLSENC_LAVFI-$(call ALLYES, TESTSRC2_FILTER LAVFI_INDEV WRAPPED_AVFRAME_DECODER MPEG2VIDEO_ENCODER HLS_MUXER MP4_MUXER FILE_PROTOCOL) += fate-hls-fmp4-frag-keyframe fate-hls-fmp4-frag-keyframe-short
+fate-hls-fmp4-frag-keyframe: tests/data/hls_fmp4_frag_keyframe.m3u8
+fate-hls-fmp4-frag-keyframe: CLEANFILES = tests/data/hls_fmp4_frag_keyframe.m3u8 tests/data/hls_fmp4_frag_keyframe.mp4
+fate-hls-fmp4-frag-keyframe: CMD = sed -n -e /^\#EXT-X-MAP:/p -e /^\#EXT-X-BYTERANGE:/p $(TARGET_PATH)/tests/data/hls_fmp4_frag_keyframe.m3u8
+fate-hls-fmp4-frag-keyframe: CMP = diff
+
+fate-hls-fmp4-frag-keyframe-short: tests/data/hls_fmp4_frag_keyframe_short.m3u8
+fate-hls-fmp4-frag-keyframe-short: CLEANFILES = tests/data/hls_fmp4_frag_keyframe_short.m3u8 tests/data/hls_fmp4_frag_keyframe_short.mp4
+fate-hls-fmp4-frag-keyframe-short: CMD = sed -n -e /^\#EXT-X-MAP:/p -e /^\#EXT-X-BYTERANGE:/p $(TARGET_PATH)/tests/data/hls_fmp4_frag_keyframe_short.m3u8
+fate-hls-fmp4-frag-keyframe-short: CMP = diff
+
FATE_HLSENC_LAVFI-yes := $(if $(call FRAMECRC), $(FATE_HLSENC_LAVFI-yes))
FATE_FFMPEG_FFPROBE += $(FATE_HLSENC_FFMPEG_FFPROBE-yes)
diff --git a/tests/ref/fate/hls-fmp4-frag-keyframe b/tests/ref/fate/hls-fmp4-frag-keyframe
new file mode 100644
index 0000000000..de0719118c
--- /dev/null
+++ b/tests/ref/fate/hls-fmp4-frag-keyframe
@@ -0,0 +1,3 @@
+#EXT-X-MAP:URI="hls_fmp4_frag_keyframe.mp4",BYTERANGE="814@0"
+#EXT-X-BYTERANGE:20959@814
+#EXT-X-BYTERANGE:11213@21773
diff --git a/tests/ref/fate/hls-fmp4-frag-keyframe-short b/tests/ref/fate/hls-fmp4-frag-keyframe-short
new file mode 100644
index 0000000000..db63e27456
--- /dev/null
+++ b/tests/ref/fate/hls-fmp4-frag-keyframe-short
@@ -0,0 +1,2 @@
+#EXT-X-MAP:URI="hls_fmp4_frag_keyframe_short.mp4",BYTERANGE="814@0"
+#EXT-X-BYTERANGE:32172@814