[ffmpeg] branch release/7.1 updated (dac2a1116d -> 40b336e650)
This is an automated email from the git hooks/post-receive script. Git pushed a change to branch release/7.1 in repository ffmpeg. from dac2a1116d fate/ffmpeg: remove comparison against ref from fix_sub_duration_heartbeat new bdfaec89fe avformat/iamf_parse: fix setting denominator in AVIAMFLayer.demixing_matrix new c0272bf654 avformat/iamf_writer: fix writting some ambisonics fields in Audio Elements new 40b336e650 avformat/iamf_writer: check that stream count is consistent for ambisonic Audio Elements The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: libavformat/iamf_parse.c | 2 +- libavformat/iamf_writer.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-)
This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch release/7.1 in repository ffmpeg. commit bdfaec89febaabaf05cb4d5df72396b548ce6178 Author: James Almer <jamrial@gmail.com> AuthorDate: Sat Dec 27 17:08:30 2025 -0300 Commit: James Almer <jamrial@gmail.com> CommitDate: Tue Dec 30 20:25:18 2025 -0300 avformat/iamf_parse: fix setting denominator in AVIAMFLayer.demixing_matrix The format of demixing_matrix is Q15 fixed point values. Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 03a981445ee89a567e5a98ec88cbbbb8d3e3af72) --- libavformat/iamf_parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c index 8fe7e1bb0e..1050219591 100644 --- a/libavformat/iamf_parse.c +++ b/libavformat/iamf_parse.c @@ -487,7 +487,7 @@ static int ambisonics_config(void *s, AVIOContext *pb, return AVERROR(ENOMEM); for (int i = 0; i < demixing_matrix_size; i++) - layer->demixing_matrix[i] = av_make_q(sign_extend(avio_rb16(pb), 16), 1 << 8); + layer->demixing_matrix[i] = av_make_q(sign_extend(avio_rb16(pb), 16), 1 << 15); for (int i = 0; i < substream_count; i++) { IAMFSubStream *substream = &audio_element->substreams[i];
This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch release/7.1 in repository ffmpeg. commit c0272bf65474a636262e59625da4c918bbf8e19a Author: James Almer <jamrial@gmail.com> AuthorDate: Sat Dec 27 18:06:32 2025 -0300 Commit: James Almer <jamrial@gmail.com> CommitDate: Tue Dec 30 20:25:18 2025 -0300 avformat/iamf_writer: fix writting some ambisonics fields in Audio Elements The fields are defined as 8 bit long unsigned ints. Fortunately, writing most sane values as leb is equivalent, which is why no tests are affected. Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 21ff60d2cf7dfe00400ffef6a8843736f4cf9a2f) --- libavformat/iamf_writer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/iamf_writer.c b/libavformat/iamf_writer.c index 27926f859a..d13bd8fecc 100644 --- a/libavformat/iamf_writer.c +++ b/libavformat/iamf_writer.c @@ -586,8 +586,8 @@ static int ambisonics_config(const IAMFAudioElement *audio_element, const AVIAMFLayer *layer = element->layers[0]; ffio_write_leb(dyn_bc, 0); // ambisonics_mode - ffio_write_leb(dyn_bc, layer->ch_layout.nb_channels); // output_channel_count - ffio_write_leb(dyn_bc, audio_element->nb_substreams); // substream_count + avio_w8(dyn_bc, layer->ch_layout.nb_channels); // output_channel_count + avio_w8(dyn_bc, audio_element->nb_substreams); // substream_count if (layer->ch_layout.order == AV_CHANNEL_ORDER_AMBISONIC) for (int i = 0; i < layer->ch_layout.nb_channels; i++)
This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch release/7.1 in repository ffmpeg. commit 40b336e65043cbde6136ed338a18e3941dd0e6da Author: James Almer <jamrial@gmail.com> AuthorDate: Sat Dec 27 19:11:07 2025 -0300 Commit: James Almer <jamrial@gmail.com> CommitDate: Tue Dec 30 20:25:18 2025 -0300 avformat/iamf_writer: check that stream count is consistent for ambisonic Audio Elements Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit a0fc454871c116d5bd1bbec5138dfe3ffcb1f11d) --- libavformat/iamf_writer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/iamf_writer.c b/libavformat/iamf_writer.c index d13bd8fecc..61d69373d9 100644 --- a/libavformat/iamf_writer.c +++ b/libavformat/iamf_writer.c @@ -583,8 +583,12 @@ static int ambisonics_config(const IAMFAudioElement *audio_element, AVIOContext *dyn_bc) { const AVIAMFAudioElement *element = audio_element->celement; + const IAMFLayer *ilayer = &audio_element->layers[0]; const AVIAMFLayer *layer = element->layers[0]; + if (audio_element->nb_substreams != ilayer->substream_count) + return AVERROR(EINVAL); + ffio_write_leb(dyn_bc, 0); // ambisonics_mode avio_w8(dyn_bc, layer->ch_layout.nb_channels); // output_channel_count avio_w8(dyn_bc, audio_element->nb_substreams); // substream_count
participants (2)
-
ffmpeg-git -
James Almer