From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 1CAB04BC97 for ; Tue, 30 Dec 2025 23:26:35 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'Q6Hb5jIkCRuvlPlTHcYGTIXUQgB36ED8yHvPj+VF+Pw=', expected b'aoqiByedZOsOmq0n0pKRX3bSn3niNdKuzJfwnIuQ9Mk=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1767137189; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=Q6Hb5jIkCRuvlPlTHcYGTIXUQgB36ED8yHvPj+VF+Pw=; b=Y+UHchYD/seguCXJ3btw7xxE9e5yAa7C7sdzdTxEDaMefAv9ysv0eDhaxoI10tN9mmO3U Ydm+/bsDQ5LxSP0cf0XSgjNUHO9zbhAvrgkieR4hQk202cDaeZYJURCcpCOEQ7Kh/Nuj73E JYL7WoKJWWxzComeKcEfr9XbjKic7Zs2OrXeY2u1SlWT5sy75w9sPFNt4enlvGm75y/mnUO Ite3HSXVNnjiQd60TeaujqUUCxTRJu3MENbJVN5q6RnPH/NAy5qVa1Of/k52G4adOwo/4Gw b7MQVLMzwQXKIuwWwikVnW7jDglgbwFeeA7wVnwbOP1eJ/KkQ+R7u2HgdDiA== Received: from [172.20.0.4] (unknown [172.20.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 250FC690C2A; Wed, 31 Dec 2025 01:26:29 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1767137176; b=rud3EhsLVpSrqg07aqDJT18eqo4Bx1RnTmJXAwGpZBjWcr1WHLFCFXxSmJnxM81do5tQG C+OqknItiKhAzBgC99vzIMPq8z3VgwGR4Fts7N9TYwoRTnX3fhi/Xcokt6ISkaMHBoecJu7 f76JGpxpEykfIo3bKbE1Xj9Kkdg9OgEAQjerxH2GYHFUSFUn4B8x0Mkl7vNSac7HoYJp9qa zF0V73ZkqKiKMUm+wIVbDQ1BIBAaRVOs9/A3QrYjykyQ+i97kEgNFqA6+rBe/DIpjUIES2x 9LZ6Ln2kStNiguvySxlGw3WPDVB82FxxGgG1DpPhDwfYPKIys4Z0wWlfqPXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1767137176; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=BM5xHn1WuUPTHr5KZSeNV8jFDNITBhaBRm+6XViJUeE=; b=tN81iYujo6fWae2V45aOU01OTgiH0ucZhnQQoQfv9oL/7TbOp4YX7UAdNyIdyHJld5jAY z5nPSWRHI35ktgvz4nozIH1aXBHdHFHrn9NoJMeYJMSb3NoG9x8NZ2c4lzkScZTIYPAkzSg FN08rTLJo4ohdmHj1NtBbkSmoCF80vCNADFGoRg6pP1JX2klEDyAOk6tDzQK4hj8svNL4Xb 9LTLjHXy94D7nkKEmZoWv7mnjQHgHO2ZU5FlrDq173XSgo/aKQmxysyZ1oo6IIFKTWT9ytS TlFYR2XbO9mwDedfHyX1qwvuJ4X1vM1zqogbQ4vDrwZQdESkoFnfc96l9c8w== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1767137168; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=aoqiByedZOsOmq0n0pKRX3bSn3niNdKuzJfwnIuQ9Mk=; b=CTEjbYHRL43EL2p7HXCnGweYaWeHbZ/V+uQcoRt6sOlSgHpWxHa3dRrOK/u0W5FGgh1d4 KPXc6sUfqsNdAd+fFDhzLEE99TNFpo7bfroMYEbpukJ+9h8INaPTIZTssbWtR7RABUis7w3 baSE5WPn9a9kTrwGj4ettTeDNvXOKMgQkMKrz52zHbChXSVhlbjk62lQoVB80Dh+dPA/U7n iU5fJiOVccsoh9uzW0K067QQ1EdYkBxuvgHhAGcRODKy8ImAMvscLc30/xosESQ9t6IzLv6 SlQwFaORJKg8kSs5es/w+ILf3H9RDE659dOs6FDB7yml+64kvjhqLu28sAcQ== Received: from de3a2b3407a2 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id A703C690AD4 for ; Wed, 31 Dec 2025 01:26:08 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Dec 2025 23:26:08 -0000 Message-ID: <176713716882.25.5226893501759429641@4457048688e7> Message-ID-Hash: NN6I7U6AJBQOWN75FJQCJ6BIX2ZAZWAS X-Message-ID-Hash: NN6I7U6AJBQOWN75FJQCJ6BIX2ZAZWAS X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PR] [release/7.1] backport some IAMF fixes (PR #21331) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: James Almer via ffmpeg-devel Cc: James Almer Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21331 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21331 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21331.patch >>From bdfaec89febaabaf05cb4d5df72396b548ce6178 Mon Sep 17 00:00:00 2001 From: James Almer Date: Sat, 27 Dec 2025 17:08:30 -0300 Subject: [PATCH 1/3] 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 (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]; -- 2.49.1 >>From c0272bf65474a636262e59625da4c918bbf8e19a Mon Sep 17 00:00:00 2001 From: James Almer Date: Sat, 27 Dec 2025 18:06:32 -0300 Subject: [PATCH 2/3] 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 (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++) -- 2.49.1 >>From 40b336e65043cbde6136ed338a18e3941dd0e6da Mon Sep 17 00:00:00 2001 From: James Almer Date: Sat, 27 Dec 2025 19:11:07 -0300 Subject: [PATCH 3/3] avformat/iamf_writer: check that stream count is consistent for ambisonic Audio Elements Signed-off-by: James Almer (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 -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org