[FFmpeg-devel] [PATCH] avformat/iamf_parse: ensure each layout in an scalable channel representation has an increasing number of channels (PR #21017)

[FFmpeg-devel] [PATCH] avformat/iamf_parse: ensure each layout in an scalable channel representation has an increasing number of channels (PR #21017)

[James Almer via ffmpeg-devel]

PR #21017 opened by James Almer (jamrial)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21017
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21017.patch

Fixes issue #21013


>From c6347268fe0a57800bdfc86bc7cd58b65d857da2 Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Tue, 25 Nov 2025 10:26:27 -0300
Subject: [PATCH] avformat/iamf_parse: ensure each layout in an scalable
 channel representation has an increasing number of channels

Fixes issue #21013

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/iamf_parse.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c
index 50acd7cf5a..737e3f7404 100644
--- a/libavformat/iamf_parse.c
+++ b/libavformat/iamf_parse.c
@@ -406,6 +406,9 @@ static int scalable_channel_layout_config(void *s, AVIOContext *pb,
                                                           .nb_channels = substream_count +
                                                                          coupled_substream_count };
 
+        if (i && ch_layout.nb_channels <= audio_element->element->layers[i-1]->ch_layout.nb_channels)
+            return AVERROR_INVALIDDATA;
+
         for (int j = 0; j < substream_count; j++) {
             IAMFSubStream *substream = &audio_element->substreams[k++];
 
-- 
2.49.1

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org