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 562434DB1D for ; Tue, 30 Dec 2025 23:25:43 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'QNAb0/aWY/nSafViSaBtm9V0oZMnzFS+NtExPP3KpCw=', expected b'zhtI8pQt3PD4Mm/eE73KfKCTEv1CLRKkgRKEsv2cb38=')) 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=1767137129; 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=QNAb0/aWY/nSafViSaBtm9V0oZMnzFS+NtExPP3KpCw=; b=TyX/AyWLtA2keIOxHklqJ8Z+MCagEarzecbFL4arOI0/Jln9q2ucMUt3voQ5jYuGMw3gm 01IFZ4v7RHWeL9LNIKLMfEWKxUsrPUBbRLcp9I4946Jz7xHpDP7Ap0Eu06NoIm0Lk6y5HqY UUUAtSoyzKKmsAN4w8yvbmhqo8WEb+SZtZr4tR5mm/ih1Rp6u0klJSc1BrWUaRoHsZ+pTXU dP2qWlIrYknZeCsu15QUfKZdR5IT6V+4Te9obq/T3UpumBj5UzWsJkSg0qTuCw5KnzpNWCm QmCW7atVReBTli/SnEKLMLrrNi2HKwxMTzJyvsbCYg/q8eDFIdk2J5MMvPIw== Received: from [172.20.0.4] (unknown [172.20.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id D3B11690C6A; Wed, 31 Dec 2025 01:25:29 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1767137115; b=OTf9RUaQcfLIoA+z/444dKdO6yFZrEPIKiT+yOD4CGSZJ4zlUkvyrXaPCw77RM0D0RSZ3 s1c8HkR6J7daPeWh5/n+AqttIZu1mC4C5cBq//+wbSPsb8BM4ODho0/p9xjw8qJDHUMcONw vohYuayhvnVPy1GaZy2IGPJXU91MFHJPFKdVTpDJN7z3LoFIm3P7bG8BbTnTtYrlf+iDPCC gB5BzClvmXFMxv2q4Zope/QacxMX7ebIBNGfW7AxtTLBwmt+sFzBMOaV2KCNw/N6ETfOxEF eTLg5RQmB03ULWC4TrNXXZnOrRcmXK/oFrGgGohxGejJx3f85BVJwloX0HCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1767137115; 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=Py2lmgN+u2li/j2FH5GPTJqQVlAHO6crh5HlNyovTBo=; b=BLmla/5xNggBEMCGsISmr2MX5lna8dsg3OYBA0c1QHprOZwtYZsd9s0CojSgNPw61awyp 9qT+rFUTH4t+jMH1zCKbT/Y1XDP1I76VAbapnCmpxmDrQtDNoFm8bWtBtwgZCZLM3+bNrMz mf0dN64JyE5BB8pDYf+x/Sde3dBB0ZQBV/NZEYj9B9hMexzzdUrwZ8Pyc2Xs9hOzEj8Sj8B 7PtY822nt8R3VjquKqunoPaqWH+l05n+2RkDYhegBvgLMn9KKNn5ChIh3H78/6Q1+eSVLTN fEbiLpDgBbsziX5gpkzoSmVczHjL/l2lYCFTRzaDsGUNYe0leeLpsxEAcGCA== 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=1767137107; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=zhtI8pQt3PD4Mm/eE73KfKCTEv1CLRKkgRKEsv2cb38=; b=RgRYn7tmDmnCgvppxThsEXPjTGphv+ItYSraX3PQFMv6Wuh0dSh5AlQ/kp0YvZh8LTQTC Ma+jtrLTA9XSlzod6Da24b9+olrGSoLl+QKYyiMkMtcgPR+yUMVxI7LVaMIaKZsUhsoLXLn cTHnCPV9wzB8I6YkB7LNjB7zPE7Z0RWbjMPPGWSbnt7kUktz8lmDE2iHK64bakh9nh0yP17 +aCoKJscwdIevgUUVKiuLMifyYXO8w+42MkCc/qri9dwyxUaZ7mmV0/hSDpLrWJRXgFqF8e jNaV7hOi6DRbyt0eMIkDFahhd571G9BoIAAm1/7G5sI9Ms9bbjtJVZMHJWcg== Received: from de3a2b3407a2 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 80A31690AD4 for ; Wed, 31 Dec 2025 01:25:07 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Dec 2025 23:25:07 -0000 Message-ID: <176713710769.25.8067218352603503339@4457048688e7> Message-ID-Hash: GP6V4VVGTYLDQINQJKYDJE2XA2WQRTDR X-Message-ID-Hash: GP6V4VVGTYLDQINQJKYDJE2XA2WQRTDR 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/8.0] backport some IAMF fixes (PR #21330) 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 #21330 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21330 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21330.patch >>From af60dd84194b8ae6a3c1bf4ee474bc06bcf7023d 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 597d800be0..65dbfa0d1e 100644 --- a/libavformat/iamf_parse.c +++ b/libavformat/iamf_parse.c @@ -555,7 +555,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 06fcee2e2605364bda5613ff28ef5d06e3dc0377 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 e9dd170380..4ad6521f31 100644 --- a/libavformat/iamf_writer.c +++ b/libavformat/iamf_writer.c @@ -662,8 +662,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 bfa334de42a5d81df2bcea67113acf718593aaf6 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 4ad6521f31..c2de13b543 100644 --- a/libavformat/iamf_writer.c +++ b/libavformat/iamf_writer.c @@ -659,8 +659,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