May 2026 - ffmpeg-devel - lists.ffmpeg.org

[PR] configure: search linker paths for actual library files in msvc_common_flags (PR #23048)
by Greisberger Christophe 08 May '26

08 May '26

PR #23048 opened by Greisberger Christophe (Greisby) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23048 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23048.patch Meson-built packages on Windows produce libfoo.a instead of foo.lib (mesonbuild/meson#7378), so the naive '-lfoo -> foo.lib' translation in msvc_common_flags() fails at link time. In Conan, lcms is built by Meson, pulled-in by libjxl and configure fails finding lcms. There was already a special case for libx264, this extends to any library. Introduce _msvc_resolve_lib() which parses `$LDFLAGS` for -LIBPATH: entries and searches those directories for the actual library file (foo.lib, libfoo.a, libfoo.lib, foo.a), falling back to foo.lib if nothing is found. From 45b8c7f0acf80f587d321f3631bb5ebb0d64819d Mon Sep 17 00:00:00 2001 From: Greisberger Christophe <greisberger(a)zenon-media.com> Date: Fri, 8 May 2026 08:42:29 +0200 Subject: [PATCH] configure: search linker paths for actual library files in msvc_common_flags Meson-built packages on Windows produce libfoo.a instead of foo.lib (mesonbuild/meson#7378), so the naive '-lfoo -> foo.lib' translation in msvc_common_flags() fails at link time. Introduce _msvc_resolve_lib() which parses `$LDFLAGS` for -LIBPATH: entries and searches those directories for the actual library file (foo.lib, libfoo.a, libfoo.lib, foo.a), falling back to foo.lib if nothing is found. Signed-off-by: Greisberger Christophe <greisberger(a)zenon-media.com> --- configure | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 9bce658932..2d6aecd76d 100755 --- a/configure +++ b/configure @@ -5180,6 +5180,23 @@ cparser_flags(){ } msvc_common_flags(){ + # Resolve a library name by searching linker paths for actual files. + # Meson-built packages on Windows produce libfoo.a instead of foo.lib (mesonbuild/meson#7378), so the naive "-lfoo -> foo.lib" fails. + # Parse $LDFLAGS for -LIBPATH: entries (set by Conan/env) since test_ld splits -L and -l flags into separate subshell invocations. + _msvc_resolve_lib(){ + _name="$1" + for _flag in $LDFLAGS; do + case $_flag in + -LIBPATH:*) _dir="${_flag#-LIBPATH:}" ;; + -libpath:*) _dir="${_flag#-libpath:}" ;; + *) continue ;; + esac + for _cand in "${_name}.lib" "lib${_name}.a" "lib${_name}.lib" "${_name}.a"; do + [ -f "${_dir}/${_cand}" ] && echo "$_cand" && return + done + done + echo "${_name}.lib" + } for flag; do case $flag in # In addition to specifying certain flags under the compiler @@ -5199,9 +5216,8 @@ msvc_common_flags(){ -march=*) ;; -mfp16-format=*) ;; -lz) echo zlib.lib ;; - -lx264) echo libx264.lib ;; -lstdc++) ;; - -l*) echo ${flag#-l}.lib ;; + -l*) _msvc_resolve_lib "${flag#-l}" ;; -LARGEADDRESSAWARE) echo $flag ;; -L*) [ "$_flags_type" = "link" ] && echo -libpath:${flag#-L} ;; -Wl,*) ;; -- 2.52.0

1 0

[PR] avcodec/bsf/smpte436m_to_eia608: Use goto fail in ff_smpte436m_to_eia608_filter() (PR #23047)
by michaelni 07 May '26

07 May '26

PR #23047 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23047 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23047.patch Fixes: memleaks Fixes: 501913473/clusterfuzz-testcase-minimized-ffmpeg_BSF_SMPTE436M_TO_EIA608_fuzzer-5607133705207808 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> From 17dd3633900a480ce3ac03f01c5f020cc11bd051 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <michael(a)niedermayer.cc> Date: Fri, 8 May 2026 03:44:54 +0200 Subject: [PATCH] avcodec/bsf/smpte436m_to_eia608: Use goto fail in ff_smpte436m_to_eia608_filter() Fixes: memleaks Fixes: 501913473/clusterfuzz-testcase-minimized-ffmpeg_BSF_SMPTE436M_TO_EIA608_fuzzer-5607133705207808 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavcodec/bsf/smpte436m_to_eia608.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/bsf/smpte436m_to_eia608.c b/libavcodec/bsf/smpte436m_to_eia608.c index 529ae88794..268108c9a8 100644 --- a/libavcodec/bsf/smpte436m_to_eia608.c +++ b/libavcodec/bsf/smpte436m_to_eia608.c @@ -73,7 +73,7 @@ static int ff_smpte436m_to_eia608_filter(AVBSFContext *ctx, AVPacket *out) return 0; } if (ret != AVERROR_EOF) - return ret; + goto fail; ret = AVERROR(EAGAIN); fail: -- 2.52.0

1 0

[PR] avformat/hls: disable http_persistent/http_multiple with custom io_open (PR #23046)
by Kacper Michajłow 07 May '26

07 May '26

PR #23046 opened by Kacper Michajłow (kasper93) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23046 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23046.patch Both rely on the AVIOContext being backed by the builtin URLContext. When the API user overrides io_open, the keepalive path asserts on the missing URLContext and the http_multiple auto-detect probe fails on every read. http_multiple=1 still works even with custom IO. Signed-off-by: Kacper Michajłow <kasper93(a)gmail.com> From 8f1c76dc2ab4cb1f2674c78bdf115289dc3012a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93(a)gmail.com> Date: Fri, 8 May 2026 00:59:51 +0200 Subject: [PATCH] avformat/hls: disable http_persistent/http_multiple with custom io_open MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Both rely on the AVIOContext being backed by the builtin URLContext. When the API user overrides io_open, the keepalive path asserts on the missing URLContext and the http_multiple auto-detect probe fails on every read. http_multiple=1 still works even with custom IO. Signed-off-by: Kacper Michajłow <kasper93(a)gmail.com> --- libavformat/hls.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libavformat/hls.c b/libavformat/hls.c index df13b139f1..29dc08ef1f 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2157,6 +2157,22 @@ static int hls_read_header(AVFormatContext *s) if ((ret = ffio_copy_url_options(s->pb, &c->avio_opts)) < 0) return ret; + /* http_persistent and http_multiple auto-detection both rely on the + * AVIOContext being backed by the builtin URLContext. Neither works + * when io_open is overridden with a custom callback. */ + if (!ffio_geturlcontext(s->pb)) { + if (c->http_persistent) { + av_log(s, AV_LOG_WARNING, "Disabling http_persistent due to custom io_open.\n"); + c->http_persistent = 0; + } + /* Only auto-detection is disabled, enabling http_multiple can still work + * with custom io_open. */ + if (c->http_multiple == -1) { + av_log(s, AV_LOG_WARNING, "Disabling http_multiple due to custom io_open.\n"); + c->http_multiple = 0; + } + } + /* XXX: Some HLS servers don't like being sent the range header, in this case, we need to set http_seekable = 0 to disable the range header */ -- 2.52.0

1 0

[PR] avformat/matroskaenc: Write additional mappings for webm (PR #23045)
by vigneshvg 07 May '26

07 May '26

PR #23045 opened by vigneshvg URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23045 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23045.patch The elements written in mkv_write_blockadditionmapping (MaxBlockAdditionID, BlockAddIDType and BlockAddIDValue) are all allowed in WebM as well. Move them out of the "if (!IS_WEBM)" block. Matroska spec: https://www.matroska.org/technical/elements.html#MaxBlockAdditionID (See column with title "W" which shows WebM availability). Signed-off-by: Vignesh Venkat <vigneshv(a)google.com> From 996a264a5316893f01112d31144a1dcd89718d17 Mon Sep 17 00:00:00 2001 From: Vignesh Venkat <vigneshv(a)google.com> Date: Thu, 7 May 2026 15:28:07 -0700 Subject: [PATCH] avformat/matroskaenc: Write additional mappings for webm The elements written in mkv_write_blockadditionmapping (MaxBlockAdditionID, BlockAddIDType and BlockAddIDValue) are all allowed in WebM as well. Move them out of the "if (!IS_WEBM)" block. Matroska spec: https://www.matroska.org/technical/elements.html#MaxBlockAdditionID (See column with title "W" which shows WebM availability). Signed-off-by: Vignesh Venkat <vigneshv(a)google.com> --- libavformat/matroskaenc.c | 39 +++++++++++------------- tests/ref/fate/webm-av1-extradata-update | 4 +-- tests/ref/fate/webm-dash-chapters | 4 +-- tests/ref/fate/webm-hdr10-plus-remux | 6 ++-- tests/ref/fate/webm-webvtt-remux | 4 +-- 5 files changed, 27 insertions(+), 30 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index f4d4a9cc88..b90485a528 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2145,8 +2145,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, return AVERROR(EINVAL); } - if (!IS_WEBM(mkv)) - mkv_write_blockadditionmapping(s, mkv, par, pb, track, st); + mkv_write_blockadditionmapping(s, mkv, par, pb, track, st); if (!IS_WEBM(mkv) || par->codec_id != AV_CODEC_ID_WEBVTT) { uint8_t *codecpriv; @@ -3372,30 +3371,28 @@ after_cues: if (mkv->track.bc) { // write Tracks master - if (!IS_WEBM(mkv)) { - AVIOContext *track_bc = mkv->track.bc; + AVIOContext *track_bc = mkv->track.bc; - for (unsigned i = 0; i < s->nb_streams; i++) { - const mkv_track *track = &mkv->tracks[i]; + for (unsigned i = 0; i < s->nb_streams; i++) { + const mkv_track *track = &mkv->tracks[i]; - if (!track->max_blockaddid) - continue; + if (!track->max_blockaddid) + continue; - // We reserved a single byte to write this value. - av_assert0(track->max_blockaddid <= 0xFF); + // We reserved a single byte to write this value. + av_assert0(track->max_blockaddid <= 0xFF); - avio_seek(track_bc, track->blockadditionmapping_offset, SEEK_SET); + avio_seek(track_bc, track->blockadditionmapping_offset, SEEK_SET); - put_ebml_uint(track_bc, MATROSKA_ID_TRACKMAXBLKADDID, - track->max_blockaddid); - if (track->max_blockaddid == MATROSKA_BLOCK_ADD_ID_ITU_T_T35) { - ebml_master mapping_master = start_ebml_master(track_bc, MATROSKA_ID_TRACKBLKADDMAPPING, 8); - put_ebml_uint(track_bc, MATROSKA_ID_BLKADDIDTYPE, - MATROSKA_BLOCK_ADD_ID_TYPE_ITU_T_T35); - put_ebml_uint(track_bc, MATROSKA_ID_BLKADDIDVALUE, - MATROSKA_BLOCK_ADD_ID_ITU_T_T35); - end_ebml_master(track_bc, mapping_master); - } + put_ebml_uint(track_bc, MATROSKA_ID_TRACKMAXBLKADDID, + track->max_blockaddid); + if (track->max_blockaddid == MATROSKA_BLOCK_ADD_ID_ITU_T_T35) { + ebml_master mapping_master = start_ebml_master(track_bc, MATROSKA_ID_TRACKBLKADDMAPPING, 8); + put_ebml_uint(track_bc, MATROSKA_ID_BLKADDIDTYPE, + MATROSKA_BLOCK_ADD_ID_TYPE_ITU_T_T35); + put_ebml_uint(track_bc, MATROSKA_ID_BLKADDIDVALUE, + MATROSKA_BLOCK_ADD_ID_ITU_T_T35); + end_ebml_master(track_bc, mapping_master); } } diff --git a/tests/ref/fate/webm-av1-extradata-update b/tests/ref/fate/webm-av1-extradata-update index 3a84511bae..607909d46f 100644 --- a/tests/ref/fate/webm-av1-extradata-update +++ b/tests/ref/fate/webm-av1-extradata-update @@ -1,5 +1,5 @@ -dc7593b977b092e522018de7e0d12681 *tests/data/fate/webm-av1-extradata-update.webm -23047 tests/data/fate/webm-av1-extradata-update.webm +4be8d56dd9c4c94b704d41c8b354f3e7 *tests/data/fate/webm-av1-extradata-update.webm +23062 tests/data/fate/webm-av1-extradata-update.webm #extradata 0: 35, 0x527207cd #tb 0: 1/1000 #media_type 0: video diff --git a/tests/ref/fate/webm-dash-chapters b/tests/ref/fate/webm-dash-chapters index f32e83852f..11e2f98707 100644 --- a/tests/ref/fate/webm-dash-chapters +++ b/tests/ref/fate/webm-dash-chapters @@ -1,5 +1,5 @@ -e2d3d812e6d9cf05a36eaefe02801a99 *tests/data/fate/webm-dash-chapters.webm -111149 tests/data/fate/webm-dash-chapters.webm +d3146d0817d9f3471b4bda4fa61cc090 *tests/data/fate/webm-dash-chapters.webm +111153 tests/data/fate/webm-dash-chapters.webm #extradata 0: 3469, 0xc6769ddc #tb 0: 1/1000 #media_type 0: audio diff --git a/tests/ref/fate/webm-hdr10-plus-remux b/tests/ref/fate/webm-hdr10-plus-remux index 9180d39596..2510efbbbf 100644 --- a/tests/ref/fate/webm-hdr10-plus-remux +++ b/tests/ref/fate/webm-hdr10-plus-remux @@ -1,5 +1,5 @@ -7c5ae91189589c07f92aa97cb9b3d9e1 *tests/data/fate/webm-hdr10-plus-remux.webm -13842 tests/data/fate/webm-hdr10-plus-remux.webm +4bd2b26ae7c25c3e873ee76229ecbe7c *tests/data/fate/webm-hdr10-plus-remux.webm +13857 tests/data/fate/webm-hdr10-plus-remux.webm #tb 0: 1/1000 #media_type 0: video #codec_id 0: vp9 @@ -16,7 +16,7 @@ dts_time=0.000000 duration=40 duration_time=0.040000 size=13350 -pos=392 +pos=407 flags=K__ [SIDE_DATA] side_data_type=HDR10+ Dynamic Metadata (SMPTE 2094-40) diff --git a/tests/ref/fate/webm-webvtt-remux b/tests/ref/fate/webm-webvtt-remux index f00a04c24c..1c47938bb9 100644 --- a/tests/ref/fate/webm-webvtt-remux +++ b/tests/ref/fate/webm-webvtt-remux @@ -1,5 +1,5 @@ -c372c76c062d368f1d17373c19f83579 *tests/data/fate/webm-webvtt-remux.webm -6524 tests/data/fate/webm-webvtt-remux.webm +22d1105067d2ac031ecc21542750255e *tests/data/fate/webm-webvtt-remux.webm +6540 tests/data/fate/webm-webvtt-remux.webm #tb 0: 1/1000 #media_type 0: subtitle #codec_id 0: webvtt -- 2.52.0

1 0

[PR] avcodec/libvpxenc: Copy Smpte2094App5 metadata (PR #23044)
by vigneshvg 07 May '26

07 May '26

PR #23044 opened by vigneshvg URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23044 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23044.patch If incoming packets contain Smpte2094App5 metadata, retain them so that they are passed through to the output. Signed-off-by: Vignesh Venkat <vigneshv(a)google.com> From 82ddc76bfd3b540915a21c485667a0ebb1d41eb2 Mon Sep 17 00:00:00 2001 From: Vignesh Venkat <vigneshv(a)google.com> Date: Thu, 7 May 2026 13:06:32 -0700 Subject: [PATCH] avcodec/libvpxenc: Copy Smpte2094App5 metadata If incoming packets contain Smpte2094App5 metadata, retain them so that they are passed through to the output. Signed-off-by: Vignesh Venkat <vigneshv(a)google.com> --- libavcodec/libvpxenc.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index b21ba175ab..963fa6c619 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -74,6 +74,7 @@ typedef struct FrameData { AVBufferRef *frame_opaque_ref; AVBufferRef *hdr10_plus; + AVBufferRef *hdr_smpte2094_app5; } FrameData; typedef struct VPxEncoderContext { @@ -341,6 +342,7 @@ static void frame_data_uninit(FrameData *fd) { av_buffer_unref(&fd->frame_opaque_ref); av_buffer_unref(&fd->hdr10_plus); + av_buffer_unref(&fd->hdr_smpte2094_app5); } static av_cold void fifo_free(AVFifo **fifo) @@ -366,12 +368,13 @@ static int frame_data_submit(AVCodecContext *avctx, AVFifo *fifo, FrameData fd = { .pts = frame->pts }; int ret; + const AVFrameSideData *sd; if (IS_VP9(avctx) && // Keep HDR10+ if it has bit depth higher than 8 and // it has PQ trc (SMPTE2084). enccfg->g_bit_depth > 8 && avctx->color_trc == AVCOL_TRC_SMPTE2084) { - const AVFrameSideData *sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DYNAMIC_HDR_PLUS); + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DYNAMIC_HDR_PLUS); if (sd) { fd.hdr10_plus = av_buffer_ref(sd->buf); @@ -380,6 +383,14 @@ static int frame_data_submit(AVCodecContext *avctx, AVFifo *fifo, } } + // Keep SMPTE2094_APP5 metadata. + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DYNAMIC_HDR_SMPTE_2094_APP5); + if (sd) { + fd.hdr_smpte2094_app5 = av_buffer_ref(sd->buf); + if (!fd.hdr_smpte2094_app5) + return AVERROR(ENOMEM); + } + fd.duration = frame->duration; fd.frame_opaque = frame->opaque; if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE && frame->opaque_ref) { @@ -454,6 +465,16 @@ static int frame_data_apply(AVCodecContext *avctx, AVFifo *fifo, AVPacket *pkt) memcpy(data, fd.hdr10_plus->data, fd.hdr10_plus->size); } + if (fd.hdr_smpte2094_app5) { + data = av_packet_new_side_data(pkt, AV_PKT_DATA_DYNAMIC_HDR_SMPTE_2094_APP5, fd.hdr_smpte2094_app5->size); + if (!data) { + ret = AVERROR(ENOMEM); + goto skip; + } + + memcpy(data, fd.hdr_smpte2094_app5->data, fd.hdr_smpte2094_app5->size); + } + skip: av_fifo_drain2(fifo, 1); frame_data_uninit(&fd); -- 2.52.0

1 0

[PR] avformat/dashenc: add options for live MPD timing (PR #23043)
by jberclaz 07 May '26

07 May '26

PR #23043 opened by jberclaz URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23043 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23043.patch Allow callers to set a deterministic `availabilityStartTime` and override `suggestedPresentationDelay` for dynamic DASH manifests. This is useful for live workflows that need stable MPD timing across encoder restarts or externally controlled live latency. **Verified with:** - `git diff --check forgejo-upstream/master..HEAD` - tools/patcheck - `make libavformat/dashenc.o` - `make -j$(nproc) ffmpeg` **Smoke-tested dynamic DASH output with:** - `availability_start_time_ms=1700000000000` - `suggested_presentation_delay=42` **Result:** - `availabilityStartTime="2023-11-14T22:13:20.000Z"` - `suggestedPresentationDelay="PT42.0S"` From caaadb8545730464a76a3f577a50c6473122163d Mon Sep 17 00:00:00 2001 From: Jerome Berclaz <jerome(a)percipient.ai> Date: Thu, 7 May 2026 12:47:24 -0700 Subject: [PATCH] avformat/dashenc: add options for live MPD timing Allow callers to set a deterministic availabilityStartTime and override suggestedPresentationDelay for dynamic DASH manifests. This is useful for live workflows that need stable MPD timing across encoder restarts or externally controlled live latency. Signed-off-by: Jerome Berclaz <jerome(a)percipient.ai> --- doc/muxers.texi | 10 ++++++++++ libavformat/dashenc.c | 18 +++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index d9e475dbf7..0c7039a8f5 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1330,11 +1330,21 @@ element. Imply that the @option{single_file} option is set to @var{true}. In the template, @code{$ext$} is replaced with the file name extension specific for the segment format. +@item availability_start_time_ms @var{milliseconds} +Set the MPD @code{availabilityStartTime} attribute as Unix epoch time in +milliseconds. If set to @code{0}, the wall clock is used when the first +packet is written. This is useful for live outputs that need a stable +availability start time across restarts. + @item streaming @var{bool} Enable or disable chunk streaming mode of output. In chunk streaming mode, each frame will be a @code{moof} fragment which forms a chunk. This is disabled by default. +@item suggested_presentation_delay @var{duration} +Set the MPD @code{suggestedPresentationDelay} attribute. If set to +@code{0}, the last segment duration is used. + @item target_latency @var{target_latency} Set an intended target latency in seconds for serving (fractional value can be set). Applicable only when the @option{streaming} and diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index da7725fc3f..5c46314213 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -200,6 +200,8 @@ typedef struct DASHContext { AVRational min_playback_rate; AVRational max_playback_rate; int64_t update_period; + int64_t availability_start_time_ms; + int64_t suggested_presentation_delay; } DASHContext; static int dashenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename, @@ -1046,8 +1048,14 @@ static int write_manifest(AVFormatContext *s, int final) if (c->update_period) update_period = c->update_period; avio_printf(out, "\tminimumUpdatePeriod=\"PT%"PRId64"S\"\n", update_period); - if (!c->ldash) - avio_printf(out, "\tsuggestedPresentationDelay=\"PT%"PRId64"S\"\n", c->last_duration / AV_TIME_BASE); + if (!c->ldash) { + if (c->suggested_presentation_delay) { + avio_printf(out, "\tsuggestedPresentationDelay=\""); + write_time(out, c->suggested_presentation_delay); + avio_printf(out, "\"\n"); + } else + avio_printf(out, "\tsuggestedPresentationDelay=\"PT%"PRId64"S\"\n", c->last_duration / AV_TIME_BASE); + } if (c->availability_start_time[0]) avio_printf(out, "\tavailabilityStartTime=\"%s\"\n", c->availability_start_time); format_date(now_str, sizeof(now_str), av_gettime()); @@ -1981,7 +1989,9 @@ static int dash_write_packet(AVFormatContext *s, AVPacket *pkt) os->last_pts = pkt->pts; if (!c->availability_start_time[0]) { - int64_t start_time_us = av_gettime(); + int64_t start_time_us = c->availability_start_time_ms ? + c->availability_start_time_ms * 1000 : + av_gettime(); c->start_time_s = start_time_us / 1000000; format_date(c->availability_start_time, sizeof(c->availability_start_time), start_time_us); @@ -2266,7 +2276,9 @@ static const AVOption options[] = { { "seg_duration", "segment duration (in seconds, fractional value can be set)", OFFSET(seg_duration), AV_OPT_TYPE_DURATION, { .i64 = 5000000 }, 0, INT_MAX, E }, { "single_file", "Store all segments in one file, accessed using byte ranges", OFFSET(single_file), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E }, { "single_file_name", "DASH-templated name to be used for baseURL. Implies storing all segments in one file, accessed using byte ranges", OFFSET(single_file_name), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E }, + { "availability_start_time_ms", "set MPD availabilityStartTime as epoch milliseconds", OFFSET(availability_start_time_ms), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, INT64_MAX, E }, { "streaming", "Enable/Disable streaming mode of output. Each frame will be moof fragment", OFFSET(streaming), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E }, + { "suggested_presentation_delay", "set MPD suggestedPresentationDelay", OFFSET(suggested_presentation_delay), AV_OPT_TYPE_DURATION, { .i64 = 0 }, 0, INT64_MAX, E }, { "target_latency", "Set desired target latency for Low-latency dash", OFFSET(target_latency), AV_OPT_TYPE_DURATION, { .i64 = 0 }, 0, INT_MAX, E }, { "timeout", "set timeout for socket I/O operations", OFFSET(timeout), AV_OPT_TYPE_DURATION, { .i64 = -1 }, -1, INT_MAX, .flags = E }, { "update_period", "Set the mpd update interval", OFFSET(update_period), AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, E}, -- 2.52.0

1 0

[PR] vulkan: fix using encode caps before querying (PR #23042)
by nyanmisaka 07 May '26

07 May '26

PR #23042 opened by nyanmisaka URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23042 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23042.patch Fix using enc_caps.supportedEncodeFeedbackFlags before calling vkGetPhysicalDeviceVideoCapabilitiesKHR(). Otherwise the check will never pass and will fail with ENOTSUP. Fixes 3f9e04b Signed-off-by: nyanmisaka <nst799610810(a)gmail.com> Is this really not an oversight during the rebase? From b6fa60444135293a83f5f2aea2521cf574f7ecdb Mon Sep 17 00:00:00 2001 From: nyanmisaka <nst799610810(a)gmail.com> Date: Fri, 8 May 2026 02:53:15 +0800 Subject: [PATCH] vulkan: fix using encode caps before querying Fix using enc_caps.supportedEncodeFeedbackFlags before calling vkGetPhysicalDeviceVideoCapabilitiesKHR(). Otherwise the check will never pass and will fail with ENOTSUP. Fixes 3f9e04b Signed-off-by: nyanmisaka <nst799610810(a)gmail.com> --- libavcodec/vulkan_encode.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/vulkan_encode.c b/libavcodec/vulkan_encode.c index b6f0b26f6b..39c43300c4 100644 --- a/libavcodec/vulkan_encode.c +++ b/libavcodec/vulkan_encode.c @@ -772,14 +772,6 @@ av_cold int ff_vulkan_encode_init(AVCodecContext *avctx, FFVulkanEncodeContext * return AVERROR(EINVAL); } - if ((ctx->enc_caps.supportedEncodeFeedbackFlags & feedback_flags) != - feedback_flags) { - av_log (avctx, AV_LOG_ERROR, - "Driver does not support required encode feedback flags " - "(BUFFER_OFFSET and BYTES_WRITTEN).\n"); - return AVERROR(ENOTSUP); - } - ctx->base.op = &vulkan_base_encode_ops; ctx->codec = codec; @@ -881,6 +873,14 @@ av_cold int ff_vulkan_encode_init(AVCodecContext *avctx, FFVulkanEncodeContext * return AVERROR_EXTERNAL; } + if ((ctx->enc_caps.supportedEncodeFeedbackFlags & feedback_flags) != + feedback_flags) { + av_log(avctx, AV_LOG_ERROR, + "Driver does not support required encode feedback flags " + "(BUFFER_OFFSET and BYTES_WRITTEN).\n"); + return AVERROR(ENOTSUP); + } + err = init_rc(avctx, ctx); if (err < 0) return err; -- 2.52.0

1 0

[PR] avcodec: add a flag to force encoders to expect fixed size frames (PR #23041)
by James Almer 07 May '26

07 May '26

PR #23041 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23041 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23041.patch This is required for encoding and muxing PCM audio on IAMF, where variable frame size is not allowed. From cfdf6ed4b94410316ba077fd904d4583bfcdcac4 Mon Sep 17 00:00:00 2001 From: James Almer <jamrial(a)gmail.com> Date: Thu, 7 May 2026 14:53:55 -0300 Subject: [PATCH 1/6] avcodec: add a flag to force encoders to expect fixed size frames Signed-off-by: James Almer <jamrial(a)gmail.com> --- libavcodec/avcodec.h | 10 ++++++++-- libavcodec/mfenc.c | 2 ++ libavcodec/null.c | 8 ++++++++ libavcodec/options_table.h | 1 + libavcodec/pcm.c | 3 ++- libavcodec/s302menc.c | 3 ++- 6 files changed, 23 insertions(+), 4 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 780557710b..ac250a2777 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -353,6 +353,11 @@ typedef struct RcOverride{ * Discard cropping information from SPS. */ #define AV_CODEC_FLAG2_IGNORE_CROP (1 << 16) +/** + * Force audio encoders to use a fixed frame size, including the last + * frame on codecs that allow it to be smaller. + */ +#define AV_CODEC_FLAG2_FIXED_FRAME_SIZE (1 << 17) /** * Show all frames before the first keyframe @@ -1050,11 +1055,11 @@ typedef struct AVCodecContext { */ AVChannelLayout ch_layout; - /* The following data should not be initialized. */ /** * Number of samples per channel in an audio frame. * - * - encoding: set by libavcodec in avcodec_open2(). Each submitted frame + * - encoding: may be set by the user before calling avcodec_open2(), and + * libavcodec may then overwrite it if needed. Each submitted frame * except the last must contain exactly frame_size samples per channel. * May be 0 when the codec has AV_CODEC_CAP_VARIABLE_FRAME_SIZE set, then the * frame size is not restricted. @@ -1062,6 +1067,7 @@ typedef struct AVCodecContext { */ int frame_size; + /* The following data should not be initialized. */ /** * number of bytes per packet if constant and known or 0 * Used by some WAV based audio codecs. diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c index b51735268b..34607c65d4 100644 --- a/libavcodec/mfenc.c +++ b/libavcodec/mfenc.c @@ -1405,6 +1405,8 @@ static int mf_close(AVCodecContext *avctx) static av_cold int mf_init(AVCodecContext *avctx) { int ret; + if (!(avctx->flags2 & AV_CODEC_FLAG2_FIXED_FRAME_SIZE)) + avctx->frame_size = 0; if ((ret = mf_load_library(avctx)) == 0) { if ((ret = mf_init_encoder(avctx)) == 0) { return 0; diff --git a/libavcodec/null.c b/libavcodec/null.c index e443ddf4f9..ba07166831 100644 --- a/libavcodec/null.c +++ b/libavcodec/null.c @@ -44,6 +44,13 @@ const FFCodec ff_vnull_decoder = { #endif #if CONFIG_ANULL_DECODER +static av_cold int null_init(AVCodecContext *avctx) +{ + if (!(avctx->flags2 & AV_CODEC_FLAG2_FIXED_FRAME_SIZE)) + avctx->frame_size = 0; + return 0; +} + const FFCodec ff_anull_decoder = { .p.name = "anull", CODEC_LONG_NAME("null audio"), @@ -81,6 +88,7 @@ const FFCodec ff_anull_encoder = { .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ANULL, .p.capabilities = AV_CODEC_CAP_VARIABLE_FRAME_SIZE, + .init = null_init, CODEC_SAMPLEFMTS(AV_SAMPLE_FMT_U8, AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S32P, diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 99e7002076..7f01909ae6 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -85,6 +85,7 @@ static const AVOption avcodec_options[] = { {"skip_manual", "do not skip samples and export skip information as frame side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_SKIP_MANUAL}, INT_MIN, INT_MAX, A|D, .unit = "flags2"}, {"ass_ro_flush_noop", "do not reset ASS ReadOrder field on flush", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_RO_FLUSH_NOOP}, INT_MIN, INT_MAX, S|D, .unit = "flags2"}, {"icc_profiles", "generate/parse embedded ICC profiles from/to colorimetry tags", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_ICC_PROFILES}, INT_MIN, INT_MAX, S|D, .unit = "flags2"}, +{"fixed_frame_size", "Force a fixed frame size", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_FIXED_FRAME_SIZE}, INT_MIN, INT_MAX, A|E, .unit = "flags2"}, {"export_side_data", "Export metadata as side data", OFFSET(export_side_data), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT}, 0, UINT_MAX, A|V|S|D|E, .unit = "export_side_data"}, {"mvs", "export motion vectors through frame side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_EXPORT_DATA_MVS}, INT_MIN, INT_MAX, V|D, .unit = "export_side_data"}, {"prft", "export Producer Reference Time through packet side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_EXPORT_DATA_PRFT}, INT_MIN, INT_MAX, A|V|S|E, .unit = "export_side_data"}, diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 157adc92d7..d4efb39fdd 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -40,7 +40,8 @@ av_unused av_cold static int pcm_encode_init(AVCodecContext *avctx) { - avctx->frame_size = 0; + if (!(avctx->flags2 & AV_CODEC_FLAG2_FIXED_FRAME_SIZE)) + avctx->frame_size = 0; #if !CONFIG_HARDCODED_TABLES switch (avctx->codec->id) { #if CONFIG_PCM_ALAW_ENCODER diff --git a/libavcodec/s302menc.c b/libavcodec/s302menc.c index ba84ab73b6..86ac24ad70 100644 --- a/libavcodec/s302menc.c +++ b/libavcodec/s302menc.c @@ -61,7 +61,8 @@ static av_cold int s302m_encode_init(AVCodecContext *avctx) } } - avctx->frame_size = 0; + if (!(avctx->flags2 & AV_CODEC_FLAG2_FIXED_FRAME_SIZE)) + avctx->frame_size = 0; avctx->bit_rate = 48000 * avctx->ch_layout.nb_channels * (avctx->bits_per_raw_sample + 4); s->framing_index = 0; -- 2.52.0 From b754ef538bae8f50dfec43e563294104c3c9d409 Mon Sep 17 00:00:00 2001 From: James Almer <jamrial(a)gmail.com> Date: Thu, 7 May 2026 15:01:15 -0300 Subject: [PATCH 2/6] avformat/matroskaenc: use frame_size to write audio DefaultDuration Signed-off-by: James Almer <jamrial(a)gmail.com> --- libavformat/matroskaenc.c | 2 ++ tests/ref/fate/aac-autobsf-adtstoasc | 4 ++-- tests/ref/fate/matroska-dovi-write-config8 | 4 ++-- tests/ref/fate/matroska-flac-extradata-update | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index f4d4a9cc88..4412b44f33 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2097,6 +2097,8 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO); audio_frame_samples = av_get_audio_frame_duration2(par, 0); + if (!audio_frame_samples) + audio_frame_samples = par->frame_size; if (audio_frame_samples) mkv_write_default_duration(track, pb, (AVRational){ audio_frame_samples, par->sample_rate }); diff --git a/tests/ref/fate/aac-autobsf-adtstoasc b/tests/ref/fate/aac-autobsf-adtstoasc index 616f875ab3..1d7fe46536 100644 --- a/tests/ref/fate/aac-autobsf-adtstoasc +++ b/tests/ref/fate/aac-autobsf-adtstoasc @@ -1,5 +1,5 @@ -b8594ae7884fcad4acfc5b997d012857 *tests/data/fate/aac-autobsf-adtstoasc.matroska -6645 tests/data/fate/aac-autobsf-adtstoasc.matroska +e76eb6a17a975e0f12b6868082bfaf0d *tests/data/fate/aac-autobsf-adtstoasc.matroska +6653 tests/data/fate/aac-autobsf-adtstoasc.matroska #extradata 0: 2, 0x0030001c #tb 0: 1/1000 #media_type 0: audio diff --git a/tests/ref/fate/matroska-dovi-write-config8 b/tests/ref/fate/matroska-dovi-write-config8 index ca21892686..43a703bb25 100644 --- a/tests/ref/fate/matroska-dovi-write-config8 +++ b/tests/ref/fate/matroska-dovi-write-config8 @@ -1,5 +1,5 @@ -2f28699111ea95a7d2937a23e92dfd77 *tests/data/fate/matroska-dovi-write-config8.matroska -3600617 tests/data/fate/matroska-dovi-write-config8.matroska +6562aa21af7d0e8ef44c9bca106731cb *tests/data/fate/matroska-dovi-write-config8.matroska +3600625 tests/data/fate/matroska-dovi-write-config8.matroska #extradata 0: 551, 0xb1ddcd66 #extradata 1: 2, 0x00340022 #tb 0: 1/1000 diff --git a/tests/ref/fate/matroska-flac-extradata-update b/tests/ref/fate/matroska-flac-extradata-update index a4f8bf2dac..7bd2080f08 100644 --- a/tests/ref/fate/matroska-flac-extradata-update +++ b/tests/ref/fate/matroska-flac-extradata-update @@ -1,5 +1,5 @@ -f0b0a6a8a0fc975aef9048023faf7c92 *tests/data/fate/matroska-flac-extradata-update.matroska -1804 tests/data/fate/matroska-flac-extradata-update.matroska +099e0feb5990575e2b46ed9abafc998a *tests/data/fate/matroska-flac-extradata-update.matroska +1828 tests/data/fate/matroska-flac-extradata-update.matroska #extradata 0: 34, 0x93650c81 #extradata 1: 34, 0x93650c81 #extradata 2: 34, 0x93650c81 -- 2.52.0 From fccea6f36cba287c1854dc99bb240a16fb7a1126 Mon Sep 17 00:00:00 2001 From: James Almer <jamrial(a)gmail.com> Date: Thu, 7 May 2026 15:06:35 -0300 Subject: [PATCH 3/6] avcodec/encode: report that the padded samples must be discarded For encoders where we pad the last frame, actually tag the silent samples as discardable. Signed-off-by: James Almer <jamrial(a)gmail.com> --- libavcodec/encode.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index f1a65a9b23..aad68586e0 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -155,6 +155,8 @@ static int encode_make_refcounted(AVCodecContext *avctx, AVPacket *avpkt) */ static int pad_last_frame(AVCodecContext *s, AVFrame *frame, const AVFrame *src, int out_samples) { + AVFrameSideData *sd; + int discard_padding; int ret; frame->format = src->format; @@ -179,6 +181,17 @@ static int pad_last_frame(AVCodecContext *s, AVFrame *frame, const AVFrame *src, s->ch_layout.nb_channels, s->sample_fmt)) < 0) goto fail; + discard_padding = frame->nb_samples - src->nb_samples; + av_assert1(discard_padding > 0); + sd = av_frame_new_side_data(frame, AV_FRAME_DATA_SKIP_SAMPLES, 10); + if (!sd) { + ret = AVERROR(ENOMEM); + goto fail; + } + AV_WL32A(sd->data, 0); + AV_WL32A(sd->data + 4, discard_padding); + AV_WL16A(sd->data + 8, 0); + return 0; fail: -- 2.52.0 From b84d827f819c23aff9efa6bd6936c3c76d9fa582 Mon Sep 17 00:00:00 2001 From: James Almer <jamrial(a)gmail.com> Date: Thu, 7 May 2026 15:15:47 -0300 Subject: [PATCH 4/6] avcodec/encode: propagate skip samples side data if present Only for non-delay codecs. Signed-off-by: James Almer <jamrial(a)gmail.com> --- libavcodec/encode.c | 14 ++++++++++++++ tests/ref/fate/dca-xll_51_16_192_768_0 | 2 +- tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2 | 2 +- tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6 | 2 +- tests/ref/fate/dca-xll_51_16_192_768_1 | 2 +- tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2 | 2 +- tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6 | 2 +- tests/ref/fate/dca-xll_51_24_48_768 | 2 +- tests/ref/fate/dca-xll_51_24_48_768-dmix_2 | 2 +- tests/ref/fate/dca-xll_51_24_48_768-dmix_6 | 2 +- tests/ref/fate/dca-xll_51_24_48_none | 2 +- tests/ref/fate/dca-xll_51_24_48_none-dmix_2 | 2 +- tests/ref/fate/dca-xll_51_24_48_none-dmix_6 | 2 +- tests/ref/fate/dca-xll_71_24_48_768_0 | 2 +- tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2 | 2 +- tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6 | 2 +- tests/ref/fate/dca-xll_71_24_48_768_1 | 2 +- tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2 | 2 +- tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6 | 2 +- tests/ref/fate/dca-xll_71_24_96_768 | 2 +- tests/ref/fate/dca-xll_71_24_96_768-dmix_2 | 2 +- tests/ref/fate/dca-xll_71_24_96_768-dmix_6 | 2 +- tests/ref/fate/dca-xll_x96_51_24_96_1509 | 2 +- tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2 | 2 +- tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6 | 2 +- tests/ref/fate/dca-xll_xch_61_24_48_768 | 2 +- tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2 | 2 +- tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6 | 2 +- tests/ref/fate/ffmpeg-filter_complex_audio | 2 +- tests/ref/fate/matroska-encoding-delay | 6 +++--- tests/ref/lavf/mkv | 6 +++--- tests/ref/lavf/mkv_attachment | 6 +++--- 32 files changed, 51 insertions(+), 37 deletions(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index aad68586e0..652ce59f6d 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -275,6 +275,20 @@ int ff_encode_encode_cb(AVCodecContext *avctx, AVPacket *avpkt, avpkt->duration = ff_samples_to_time_base(avctx, frame->nb_samples); } + if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) { + AVFrameSideData *sd = av_frame_get_side_data(frame, AV_FRAME_DATA_SKIP_SAMPLES); + if (sd && sd->size >= 10) { + uint8_t *skip_samples = av_packet_new_side_data(avpkt, AV_PKT_DATA_SKIP_SAMPLES, 10); + if (!skip_samples) { + ret = AVERROR(ENOMEM); + goto unref; + } + AV_WL32(skip_samples + 0, AV_RL32(sd->data + 0)); + AV_WL32(skip_samples + 4, AV_RL32(sd->data + 4)); + AV_WB8 (skip_samples + 8, AV_RB8 (sd->data + 8)); + AV_WB8 (skip_samples + 9, AV_RB8 (sd->data + 9)); + } + } } ret = ff_encode_reordered_opaque(avctx, avpkt, frame); diff --git a/tests/ref/fate/dca-xll_51_16_192_768_0 b/tests/ref/fate/dca-xll_51_16_192_768_0 index 30bb49ca1a..fa6978f6f6 100644 --- a/tests/ref/fate/dca-xll_51_16_192_768_0 +++ b/tests/ref/fate/dca-xll_51_16_192_768_0 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s16le #sample_rate 0: 192000 #channel_layout_name 0: 5.1(side) -0, -4096, -4096, 2048, 24576, 0x00000000 +0, -4096, -4096, 2048, 24576, 0x00000000, S=1, Skip Samples, 10, 0x00900010 0, -2048, -2048, 2048, 24576, 0x00000000 0, 0, 0, 2048, 24576, 0x004b62f1 0, 2048, 2048, 2048, 24576, 0x66edba5f diff --git a/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2 b/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2 index 30bb49ca1a..fa6978f6f6 100644 --- a/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2 +++ b/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s16le #sample_rate 0: 192000 #channel_layout_name 0: 5.1(side) -0, -4096, -4096, 2048, 24576, 0x00000000 +0, -4096, -4096, 2048, 24576, 0x00000000, S=1, Skip Samples, 10, 0x00900010 0, -2048, -2048, 2048, 24576, 0x00000000 0, 0, 0, 2048, 24576, 0x004b62f1 0, 2048, 2048, 2048, 24576, 0x66edba5f diff --git a/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6 b/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6 index 30bb49ca1a..fa6978f6f6 100644 --- a/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6 +++ b/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s16le #sample_rate 0: 192000 #channel_layout_name 0: 5.1(side) -0, -4096, -4096, 2048, 24576, 0x00000000 +0, -4096, -4096, 2048, 24576, 0x00000000, S=1, Skip Samples, 10, 0x00900010 0, -2048, -2048, 2048, 24576, 0x00000000 0, 0, 0, 2048, 24576, 0x004b62f1 0, 2048, 2048, 2048, 24576, 0x66edba5f diff --git a/tests/ref/fate/dca-xll_51_16_192_768_1 b/tests/ref/fate/dca-xll_51_16_192_768_1 index 30bb49ca1a..fa6978f6f6 100644 --- a/tests/ref/fate/dca-xll_51_16_192_768_1 +++ b/tests/ref/fate/dca-xll_51_16_192_768_1 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s16le #sample_rate 0: 192000 #channel_layout_name 0: 5.1(side) -0, -4096, -4096, 2048, 24576, 0x00000000 +0, -4096, -4096, 2048, 24576, 0x00000000, S=1, Skip Samples, 10, 0x00900010 0, -2048, -2048, 2048, 24576, 0x00000000 0, 0, 0, 2048, 24576, 0x004b62f1 0, 2048, 2048, 2048, 24576, 0x66edba5f diff --git a/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2 b/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2 index 2ebc65ab6c..b34dba9ce7 100644 --- a/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2 +++ b/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s16le #sample_rate 0: 192000 #channel_layout_name 0: stereo -0, -4096, -4096, 2048, 8192, 0x00000000 +0, -4096, -4096, 2048, 8192, 0x00000000, S=1, Skip Samples, 10, 0x00900010 0, -2048, -2048, 2048, 8192, 0x5a180402 0, 0, 0, 2048, 8192, 0x53413568 0, 2048, 2048, 2048, 8192, 0x2a34e9e1 diff --git a/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6 b/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6 index 30bb49ca1a..fa6978f6f6 100644 --- a/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6 +++ b/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s16le #sample_rate 0: 192000 #channel_layout_name 0: 5.1(side) -0, -4096, -4096, 2048, 24576, 0x00000000 +0, -4096, -4096, 2048, 24576, 0x00000000, S=1, Skip Samples, 10, 0x00900010 0, -2048, -2048, 2048, 24576, 0x00000000 0, 0, 0, 2048, 24576, 0x004b62f1 0, 2048, 2048, 2048, 24576, 0x66edba5f diff --git a/tests/ref/fate/dca-xll_51_24_48_768 b/tests/ref/fate/dca-xll_51_24_48_768 index e2c2e9c035..8a573993a1 100644 --- a/tests/ref/fate/dca-xll_51_24_48_768 +++ b/tests/ref/fate/dca-xll_51_24_48_768 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, -1024, -1024, 512, 9216, 0x00000000 +0, -1024, -1024, 512, 9216, 0x00000000, S=1, Skip Samples, 10, 0x00240004 0, -512, -512, 512, 9216, 0x00000000 0, 0, 0, 512, 9216, 0x03de31ea 0, 512, 512, 512, 9216, 0xfdbede52 diff --git a/tests/ref/fate/dca-xll_51_24_48_768-dmix_2 b/tests/ref/fate/dca-xll_51_24_48_768-dmix_2 index 43396ba00f..16be11e744 100644 --- a/tests/ref/fate/dca-xll_51_24_48_768-dmix_2 +++ b/tests/ref/fate/dca-xll_51_24_48_768-dmix_2 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: stereo -0, -1024, -1024, 512, 3072, 0x00000000 +0, -1024, -1024, 512, 3072, 0x00000000, S=1, Skip Samples, 10, 0x00240004 0, -512, -512, 512, 3072, 0x00000000 0, 0, 0, 512, 3072, 0xa27d155c 0, 512, 512, 512, 3072, 0x56efed53 diff --git a/tests/ref/fate/dca-xll_51_24_48_768-dmix_6 b/tests/ref/fate/dca-xll_51_24_48_768-dmix_6 index e2c2e9c035..8a573993a1 100644 --- a/tests/ref/fate/dca-xll_51_24_48_768-dmix_6 +++ b/tests/ref/fate/dca-xll_51_24_48_768-dmix_6 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, -1024, -1024, 512, 9216, 0x00000000 +0, -1024, -1024, 512, 9216, 0x00000000, S=1, Skip Samples, 10, 0x00240004 0, -512, -512, 512, 9216, 0x00000000 0, 0, 0, 512, 9216, 0x03de31ea 0, 512, 512, 512, 9216, 0xfdbede52 diff --git a/tests/ref/fate/dca-xll_51_24_48_none b/tests/ref/fate/dca-xll_51_24_48_none index 26a7326039..7942888eaa 100644 --- a/tests/ref/fate/dca-xll_51_24_48_none +++ b/tests/ref/fate/dca-xll_51_24_48_none @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, -1024, -1024, 1024, 18432, 0x00000000 +0, -1024, -1024, 1024, 18432, 0x00000000, S=1, Skip Samples, 10, 0x00240004 0, 0, 0, 1024, 18432, 0x5ca6ebf7 0, 1024, 1024, 1024, 18432, 0xb5520ea3 [PACKET] diff --git a/tests/ref/fate/dca-xll_51_24_48_none-dmix_2 b/tests/ref/fate/dca-xll_51_24_48_none-dmix_2 index 26a7326039..7942888eaa 100644 --- a/tests/ref/fate/dca-xll_51_24_48_none-dmix_2 +++ b/tests/ref/fate/dca-xll_51_24_48_none-dmix_2 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, -1024, -1024, 1024, 18432, 0x00000000 +0, -1024, -1024, 1024, 18432, 0x00000000, S=1, Skip Samples, 10, 0x00240004 0, 0, 0, 1024, 18432, 0x5ca6ebf7 0, 1024, 1024, 1024, 18432, 0xb5520ea3 [PACKET] diff --git a/tests/ref/fate/dca-xll_51_24_48_none-dmix_6 b/tests/ref/fate/dca-xll_51_24_48_none-dmix_6 index 26a7326039..7942888eaa 100644 --- a/tests/ref/fate/dca-xll_51_24_48_none-dmix_6 +++ b/tests/ref/fate/dca-xll_51_24_48_none-dmix_6 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, -1024, -1024, 1024, 18432, 0x00000000 +0, -1024, -1024, 1024, 18432, 0x00000000, S=1, Skip Samples, 10, 0x00240004 0, 0, 0, 1024, 18432, 0x5ca6ebf7 0, 1024, 1024, 1024, 18432, 0xb5520ea3 [PACKET] diff --git a/tests/ref/fate/dca-xll_71_24_48_768_0 b/tests/ref/fate/dca-xll_71_24_48_768_0 index fc5e4cd09f..fdd9d59d15 100644 --- a/tests/ref/fate/dca-xll_71_24_48_768_0 +++ b/tests/ref/fate/dca-xll_71_24_48_768_0 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 7.1 -0, -1024, -1024, 512, 12288, 0xa5edf1df +0, -1024, -1024, 512, 12288, 0xa5edf1df, S=1, Skip Samples, 10, 0x00240004 0, -512, -512, 512, 12288, 0x00000000 0, 0, 0, 512, 12288, 0x6613373c 0, 512, 512, 512, 12288, 0xa36ccec0 diff --git a/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2 b/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2 index e28ee93429..2d5737fb82 100644 --- a/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2 +++ b/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, -1024, -1024, 512, 9216, 0xa1d1f1df +0, -1024, -1024, 512, 9216, 0xa1d1f1df, S=1, Skip Samples, 10, 0x00240004 0, -512, -512, 512, 9216, 0x00000000 0, 0, 0, 512, 9216, 0xeeb20c83 0, 512, 512, 512, 9216, 0xfda4b141 diff --git a/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6 b/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6 index e28ee93429..2d5737fb82 100644 --- a/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6 +++ b/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, -1024, -1024, 512, 9216, 0xa1d1f1df +0, -1024, -1024, 512, 9216, 0xa1d1f1df, S=1, Skip Samples, 10, 0x00240004 0, -512, -512, 512, 9216, 0x00000000 0, 0, 0, 512, 9216, 0xeeb20c83 0, 512, 512, 512, 9216, 0xfda4b141 diff --git a/tests/ref/fate/dca-xll_71_24_48_768_1 b/tests/ref/fate/dca-xll_71_24_48_768_1 index fc5e4cd09f..fdd9d59d15 100644 --- a/tests/ref/fate/dca-xll_71_24_48_768_1 +++ b/tests/ref/fate/dca-xll_71_24_48_768_1 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 7.1 -0, -1024, -1024, 512, 12288, 0xa5edf1df +0, -1024, -1024, 512, 12288, 0xa5edf1df, S=1, Skip Samples, 10, 0x00240004 0, -512, -512, 512, 12288, 0x00000000 0, 0, 0, 512, 12288, 0x6613373c 0, 512, 512, 512, 12288, 0xa36ccec0 diff --git a/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2 b/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2 index da70f543b6..afe80260cc 100644 --- a/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2 +++ b/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: stereo -0, -1024, -1024, 512, 3072, 0x00000000 +0, -1024, -1024, 512, 3072, 0x00000000, S=1, Skip Samples, 10, 0x00240004 0, -512, -512, 512, 3072, 0x00000000 0, 0, 0, 512, 3072, 0x1bf4e1f9 0, 512, 512, 512, 3072, 0x89a1d6cd diff --git a/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6 b/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6 index f1f7ddddea..89fe2ab225 100644 --- a/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6 +++ b/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, -1024, -1024, 512, 9216, 0xa1d1f1df +0, -1024, -1024, 512, 9216, 0xa1d1f1df, S=1, Skip Samples, 10, 0x00240004 0, -512, -512, 512, 9216, 0x00000000 0, 0, 0, 512, 9216, 0xd12a04fd 0, 512, 512, 512, 9216, 0x7832be51 diff --git a/tests/ref/fate/dca-xll_71_24_96_768 b/tests/ref/fate/dca-xll_71_24_96_768 index 6bbabfc736..cf7b3d138a 100644 --- a/tests/ref/fate/dca-xll_71_24_96_768 +++ b/tests/ref/fate/dca-xll_71_24_96_768 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 96000 #channel_layout_name 0: 7.1 -0, -2048, -2048, 1024, 24576, 0xbdfff0e4 +0, -2048, -2048, 1024, 24576, 0xbdfff0e4, S=1, Skip Samples, 10, 0x00480008 0, -1024, -1024, 1024, 24576, 0x00000000 0, 0, 0, 1024, 24576, 0x47d8aee7 0, 1024, 1024, 1024, 24576, 0x2018104b diff --git a/tests/ref/fate/dca-xll_71_24_96_768-dmix_2 b/tests/ref/fate/dca-xll_71_24_96_768-dmix_2 index 1c8bd6c0e7..05fcb13147 100644 --- a/tests/ref/fate/dca-xll_71_24_96_768-dmix_2 +++ b/tests/ref/fate/dca-xll_71_24_96_768-dmix_2 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 96000 #channel_layout_name 0: 5.1(side) -0, -2048, -2048, 1024, 18432, 0xb8cdf0e4 +0, -2048, -2048, 1024, 18432, 0xb8cdf0e4, S=1, Skip Samples, 10, 0x00480008 0, -1024, -1024, 1024, 18432, 0x00000000 0, 0, 0, 1024, 18432, 0x89262806 0, 1024, 1024, 1024, 18432, 0xab935a48 diff --git a/tests/ref/fate/dca-xll_71_24_96_768-dmix_6 b/tests/ref/fate/dca-xll_71_24_96_768-dmix_6 index 1c8bd6c0e7..05fcb13147 100644 --- a/tests/ref/fate/dca-xll_71_24_96_768-dmix_6 +++ b/tests/ref/fate/dca-xll_71_24_96_768-dmix_6 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 96000 #channel_layout_name 0: 5.1(side) -0, -2048, -2048, 1024, 18432, 0xb8cdf0e4 +0, -2048, -2048, 1024, 18432, 0xb8cdf0e4, S=1, Skip Samples, 10, 0x00480008 0, -1024, -1024, 1024, 18432, 0x00000000 0, 0, 0, 1024, 18432, 0x89262806 0, 1024, 1024, 1024, 18432, 0xab935a48 diff --git a/tests/ref/fate/dca-xll_x96_51_24_96_1509 b/tests/ref/fate/dca-xll_x96_51_24_96_1509 index 05b36097d9..bc36fbe226 100644 --- a/tests/ref/fate/dca-xll_x96_51_24_96_1509 +++ b/tests/ref/fate/dca-xll_x96_51_24_96_1509 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 96000 #channel_layout_name 0: 5.1(side) -0, -2048, -2048, 1024, 18432, 0x00000000 +0, -2048, -2048, 1024, 18432, 0x00000000, S=1, Skip Samples, 10, 0x00480008 0, -1024, -1024, 1024, 18432, 0x00000000 0, 0, 0, 1024, 18432, 0xa6b18739 0, 1024, 1024, 1024, 18432, 0xd4df050d diff --git a/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2 b/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2 index 05b36097d9..bc36fbe226 100644 --- a/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2 +++ b/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 96000 #channel_layout_name 0: 5.1(side) -0, -2048, -2048, 1024, 18432, 0x00000000 +0, -2048, -2048, 1024, 18432, 0x00000000, S=1, Skip Samples, 10, 0x00480008 0, -1024, -1024, 1024, 18432, 0x00000000 0, 0, 0, 1024, 18432, 0xa6b18739 0, 1024, 1024, 1024, 18432, 0xd4df050d diff --git a/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6 b/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6 index 05b36097d9..bc36fbe226 100644 --- a/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6 +++ b/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 96000 #channel_layout_name 0: 5.1(side) -0, -2048, -2048, 1024, 18432, 0x00000000 +0, -2048, -2048, 1024, 18432, 0x00000000, S=1, Skip Samples, 10, 0x00480008 0, -1024, -1024, 1024, 18432, 0x00000000 0, 0, 0, 1024, 18432, 0xa6b18739 0, 1024, 1024, 1024, 18432, 0xd4df050d diff --git a/tests/ref/fate/dca-xll_xch_61_24_48_768 b/tests/ref/fate/dca-xll_xch_61_24_48_768 index 8a17ddb5f9..da19abb69b 100644 --- a/tests/ref/fate/dca-xll_xch_61_24_48_768 +++ b/tests/ref/fate/dca-xll_xch_61_24_48_768 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 6.1 -0, -1024, -1024, 512, 10752, 0xd4320448 +0, -1024, -1024, 512, 10752, 0xd4320448, S=1, Skip Samples, 10, 0x00240004 0, -512, -512, 512, 10752, 0x00000000 0, 0, 0, 512, 10752, 0xb0d63493 0, 512, 512, 512, 10752, 0xb25bd689 diff --git a/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2 b/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2 index 1b0e77adaf..2f1f14c320 100644 --- a/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2 +++ b/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, -1024, -1024, 512, 9216, 0xb1820448 +0, -1024, -1024, 512, 9216, 0xb1820448, S=1, Skip Samples, 10, 0x00240004 0, -512, -512, 512, 9216, 0x00000000 0, 0, 0, 512, 9216, 0xeeef4c10 0, 512, 512, 512, 9216, 0x7bb4ed68 diff --git a/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6 b/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6 index 1b0e77adaf..2f1f14c320 100644 --- a/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6 +++ b/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6 @@ -3,7 +3,7 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, -1024, -1024, 512, 9216, 0xb1820448 +0, -1024, -1024, 512, 9216, 0xb1820448, S=1, Skip Samples, 10, 0x00240004 0, -512, -512, 512, 9216, 0x00000000 0, 0, 0, 512, 9216, 0xeeef4c10 0, 512, 512, 512, 9216, 0x7bb4ed68 diff --git a/tests/ref/fate/ffmpeg-filter_complex_audio b/tests/ref/fate/ffmpeg-filter_complex_audio index 3f2f670514..4b6c73545c 100644 --- a/tests/ref/fate/ffmpeg-filter_complex_audio +++ b/tests/ref/fate/ffmpeg-filter_complex_audio @@ -6,4 +6,4 @@ 0, -256, -256, 1536, 416, 0x3001fb2d 0, 1280, 1280, 1536, 418, 0xba72fc16 0, 2816, 2816, 1536, 418, 0xba72fc16 -0, 4352, 4352, 3, 418, 0xba72fc16 +0, 4352, 4352, 3, 418, 0xba72fc16, S=1, Skip Samples, 10, 0x06070102 diff --git a/tests/ref/fate/matroska-encoding-delay b/tests/ref/fate/matroska-encoding-delay index ad1edad1e8..2ba3edf84c 100644 --- a/tests/ref/fate/matroska-encoding-delay +++ b/tests/ref/fate/matroska-encoding-delay @@ -1,5 +1,5 @@ -ece637ed28526724c88f5c69b8bf7d6f *tests/data/fate/matroska-encoding-delay.matroska -961252 tests/data/fate/matroska-encoding-delay.matroska +5febd4af0b197d8d0756fcaa99c066a2 *tests/data/fate/matroska-encoding-delay.matroska +961258 tests/data/fate/matroska-encoding-delay.matroska #extradata 0: 22, 0x32ea0490 #tb 0: 1/1000 #media_type 0: video @@ -21,7 +21,7 @@ ece637ed28526724c88f5c69b8bf7d6f *tests/data/fate/matroska-encoding-delay.matros 1, 86, 86, 24, 1152, 0xc9e85398 1, 110, 110, 24, 1152, 0xda1287d3 0, 120, 120, 40, 238290, 0xbe18b18f -1, 134, 134, 16, 1152, 0x1c9a6102 +1, 134, 134, 16, 1152, 0x1c9a6102, S=1, Skip Samples, 10, 0x03050081 [PACKET] codec_type=audio stream_index=1 diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index 94605b3f4c..6e2bdfefdd 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,3 +1,3 @@ -dd709c2b5e173eaca39cdd4a10aac3ec *tests/data/lavf/lavf.mkv -320447 tests/data/lavf/lavf.mkv -tests/data/lavf/lavf.mkv CRC=0x29d44368 +3d79de7fc1c67016e864b40cdb207ff7 *tests/data/lavf/lavf.mkv +320454 tests/data/lavf/lavf.mkv +tests/data/lavf/lavf.mkv CRC=0xb05f51a3 diff --git a/tests/ref/lavf/mkv_attachment b/tests/ref/lavf/mkv_attachment index 6effac49e1..55ce58bfe2 100644 --- a/tests/ref/lavf/mkv_attachment +++ b/tests/ref/lavf/mkv_attachment @@ -1,3 +1,3 @@ -7cd7b06892b74d66da217c8dda90bfac *tests/data/lavf/lavf.mkv_attachment -472597 tests/data/lavf/lavf.mkv_attachment -tests/data/lavf/lavf.mkv_attachment CRC=0x29d44368 +2d9ed072357227c31cb68534f7483a81 *tests/data/lavf/lavf.mkv_attachment +472604 tests/data/lavf/lavf.mkv_attachment +tests/data/lavf/lavf.mkv_attachment CRC=0xb05f51a3 -- 2.52.0 From 91be6744f6109d6ed0d3ba5ee6e5dd9465cfaec0 Mon Sep 17 00:00:00 2001 From: James Almer <jamrial(a)gmail.com> Date: Thu, 7 May 2026 15:18:41 -0300 Subject: [PATCH 5/6] avcodec/encode: honor the user request for fixed size frames Signed-off-by: James Almer <jamrial(a)gmail.com> --- libavcodec/encode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 652ce59f6d..fc7ece9c8a 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -466,7 +466,7 @@ static int encode_send_frame_internal(AVCodecContext *avctx, const AVFrame *src) avctx->audio_service_type = *(enum AVAudioServiceType*)sd->data; /* check for valid frame size */ - if (!(avctx->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)) { + if (avctx->frame_size) { /* if we already got an undersized frame, that must have been the last */ if (ec->last_audio_frame) { av_log(avctx, AV_LOG_ERROR, "frame_size (%d) was not respected for a non-last frame\n", avctx->frame_size); -- 2.52.0 From edeb514f50600d05de312c580509a51f17ba3894 Mon Sep 17 00:00:00 2001 From: James Almer <jamrial(a)gmail.com> Date: Thu, 7 May 2026 15:20:20 -0300 Subject: [PATCH 6/6] fftools:/ffmpeg_enc: honor the user request for fixed size frames Signed-off-by: James Almer <jamrial(a)gmail.com> --- fftools/ffmpeg_enc.c | 2 ++ fftools/ffmpeg_mux_init.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index a595912933..5738f2ae15 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -227,6 +227,8 @@ int enc_open(void *opaque, const AVFrame *frame) frame->ch_layout.nb_channels > 0); enc_ctx->sample_fmt = frame->format; enc_ctx->sample_rate = frame->sample_rate; + if (enc_ctx->flags2 & AV_CODEC_FLAG2_FIXED_FRAME_SIZE) + enc_ctx->frame_size = frame->nb_samples; ret = av_channel_layout_copy(&enc_ctx->ch_layout, &frame->ch_layout); if (ret < 0) return ret; diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index e0eecf78f2..638c53cfb3 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -2127,7 +2127,8 @@ static int setup_sync_queues(Muxer *mux, AVFormatContext *oc, nb_interleaved += IS_INTERLEAVED(type); nb_av_enc += IS_AV_ENC(ost, type); nb_audio_fs += (ost->enc && type == AVMEDIA_TYPE_AUDIO && - !(ost->enc->enc_ctx->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)); + (!(ost->enc->enc_ctx->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) || + (ost->enc->enc_ctx->flags2 & AV_CODEC_FLAG2_FIXED_FRAME_SIZE))); limit_frames |= ms->max_frames < INT64_MAX; limit_frames_av_enc |= (ms->max_frames < INT64_MAX) && IS_AV_ENC(ost, type); -- 2.52.0

1 0

[PR] swresample: preserve same-format copy fast path (PR #23040)
by traskinplaskin 07 May '26

07 May '26

PR #23040 opened by traskinplaskin URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23040 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23040.patch Do not clear the generic same-format memcpy converter in architecture-specific audio conversion init paths when no replacement converter is selected. This keeps same-format audio conversion on the bulk-copy path instead of falling back to scalar per-sample conversion. From c350966a94804381166db4fa6c36fe1707586bf3 Mon Sep 17 00:00:00 2001 From: traskinplaskin <traskinplaskin.bluff275(a)aleeas.com> Date: Thu, 7 May 2026 12:48:22 +0000 Subject: [PATCH] Apply patch --- libswresample/aarch64/audio_convert_init.c | 13 +++++++------ libswresample/arm/audio_convert_init.c | 13 +++++++------ libswresample/x86/audio_convert_init.c | 4 ---- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/libswresample/aarch64/audio_convert_init.c b/libswresample/aarch64/audio_convert_init.c index 60e24adb1c..70c9163c49 100644 --- a/libswresample/aarch64/audio_convert_init.c +++ b/libswresample/aarch64/audio_convert_init.c @@ -51,17 +51,18 @@ av_cold void swri_audio_convert_init_aarch64(struct AudioConvert *ac, int channels) { int cpu_flags = av_get_cpu_flags(); - - ac->simd_f= NULL; + simd_func_type *simd_f = NULL; if (have_neon(cpu_flags)) { if(out_fmt == AV_SAMPLE_FMT_S16 && in_fmt == AV_SAMPLE_FMT_FLT || out_fmt == AV_SAMPLE_FMT_S16P && in_fmt == AV_SAMPLE_FMT_FLTP) - ac->simd_f = conv_flt_to_s16_neon; + simd_f = conv_flt_to_s16_neon; if(out_fmt == AV_SAMPLE_FMT_S16 && in_fmt == AV_SAMPLE_FMT_FLTP && channels == 2) - ac->simd_f = conv_fltp_to_s16_2ch_neon; + simd_f = conv_fltp_to_s16_2ch_neon; if(out_fmt == AV_SAMPLE_FMT_S16 && in_fmt == AV_SAMPLE_FMT_FLTP && channels > 2) - ac->simd_f = conv_fltp_to_s16_nch_neon; - if(ac->simd_f) + simd_f = conv_fltp_to_s16_nch_neon; + if (simd_f) { + ac->simd_f = simd_f; ac->in_simd_align_mask = ac->out_simd_align_mask = 15; + } } } diff --git a/libswresample/arm/audio_convert_init.c b/libswresample/arm/audio_convert_init.c index ec9e62ede7..6c20310513 100644 --- a/libswresample/arm/audio_convert_init.c +++ b/libswresample/arm/audio_convert_init.c @@ -51,17 +51,18 @@ av_cold void swri_audio_convert_init_arm(struct AudioConvert *ac, int channels) { int cpu_flags = av_get_cpu_flags(); - - ac->simd_f= NULL; + simd_func_type *simd_f = NULL; if (have_neon(cpu_flags)) { if(out_fmt == AV_SAMPLE_FMT_S16 && in_fmt == AV_SAMPLE_FMT_FLT || out_fmt == AV_SAMPLE_FMT_S16P && in_fmt == AV_SAMPLE_FMT_FLTP) - ac->simd_f = conv_flt_to_s16_neon; + simd_f = conv_flt_to_s16_neon; if(out_fmt == AV_SAMPLE_FMT_S16 && in_fmt == AV_SAMPLE_FMT_FLTP && channels == 2) - ac->simd_f = conv_fltp_to_s16_2ch_neon; + simd_f = conv_fltp_to_s16_2ch_neon; if(out_fmt == AV_SAMPLE_FMT_S16 && in_fmt == AV_SAMPLE_FMT_FLTP && channels > 2) - ac->simd_f = conv_fltp_to_s16_nch_neon; - if(ac->simd_f) + simd_f = conv_fltp_to_s16_nch_neon; + if (simd_f) { + ac->simd_f = simd_f; ac->in_simd_align_mask = ac->out_simd_align_mask = 15; + } } } diff --git a/libswresample/x86/audio_convert_init.c b/libswresample/x86/audio_convert_init.c index f6d36f9ca6..4e692b0123 100644 --- a/libswresample/x86/audio_convert_init.c +++ b/libswresample/x86/audio_convert_init.c @@ -40,10 +40,6 @@ av_cold void swri_audio_convert_init_x86(struct AudioConvert *ac, int channels){ int mm_flags = av_get_cpu_flags(); - ac->simd_f= NULL; - -//FIXME add memcpy case - #define MULTI_CAPS_FUNC(flag, cap) \ if (EXTERNAL_##flag(mm_flags)) {\ if( out_fmt == AV_SAMPLE_FMT_S32 && in_fmt == AV_SAMPLE_FMT_S16 || out_fmt == AV_SAMPLE_FMT_S32P && in_fmt == AV_SAMPLE_FMT_S16P)\ -- 2.52.0

1 0

[PATCH] avcodec/cbs_h266: fix wrong condition for chroma MTT depth in PH
by Mou Fan 07 May '26

07 May '26

In the picture header parser, the chroma branch incorrectly tested sps_max_mtt_hierarchy_depth_intra_slice_chroma to decide whether to parse ph_log2_diff_max_{bt,tt}_min_qt_intra_slice_chroma. Per ITU-T H.266 (V4, 01/2026) section 7.3.2.8 "Picture header structure syntax", the condition is on the just-parsed ph_max_mtt_hierarchy_depth_intra_slice_chroma, exactly mirroring the luma branch a few lines above and the inter-slice branch below. sps_partition_constraints_override_enabled_flag allows the picture header to override the SPS values, so testing the SPS field is incorrect and desynchronises the parser whenever the PH override changes the chroma MTT depth from/to zero. Signed-off-by: Mou Fan <moufan17(a)126.com> --- libavcodec/cbs_h266_syntax_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 98a8954943..fc79ba46c7 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -2819,7 +2819,7 @@ static int FUNC(picture_header) (CodedBitstreamContext *ctx, RWContext *rw, 0, FFMIN(6, ctb_log2_size_y) - min_cb_log2_size_y); ue(ph_max_mtt_hierarchy_depth_intra_slice_chroma, 0, 2 * (ctb_log2_size_y - min_cb_log2_size_y)); - if (sps->sps_max_mtt_hierarchy_depth_intra_slice_chroma != 0) { + if (current->ph_max_mtt_hierarchy_depth_intra_slice_chroma != 0) { unsigned int min_qt_log2_size_intra_c = current->ph_log2_diff_min_qt_min_cb_intra_slice_chroma + min_cb_log2_size_y; -- 2.39.3

3 3