ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Tue Jun 17 13:43:20 2025 -0300| [9b5abbf387267584504e7c15fa19e8b8507d99a3] | committer: James Almer
avformat/iamf_writer: ensure each layer's channel layout contains all channels from the previous one Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b5abbf387267584504e7c15fa19e8b8507d99a3 --- libavformat/iamf_writer.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/libavformat/iamf_writer.c b/libavformat/iamf_writer.c index 60a0990504..e34afb9a2c 100644 --- a/libavformat/iamf_writer.c +++ b/libavformat/iamf_writer.c @@ -245,7 +245,9 @@ int ff_iamf_add_audio_element(IAMFContext *iamf, const AVStreamGroup *stg, void return AVERROR(EINVAL); } } - } else + } else { + AVBPrint bp; + for (int j, i = 0; i < iamf_audio_element->nb_layers; i++) { const AVIAMFLayer *layer = iamf_audio_element->layers[i]; for (j = 0; j < FF_ARRAY_ELEMS(ff_iamf_scalable_ch_layouts); j++) @@ -257,7 +259,6 @@ int ff_iamf_add_audio_element(IAMFContext *iamf, const AVStreamGroup *stg, void if (!av_channel_layout_compare(&layer->ch_layout, &ff_iamf_expanded_scalable_ch_layouts[j])) break; if (j >= FF_ARRAY_ELEMS(ff_iamf_expanded_scalable_ch_layouts)) { - AVBPrint bp; av_bprint_init(&bp, 0, AV_BPRINT_SIZE_AUTOMATIC); av_channel_layout_describe_bprint(&layer->ch_layout, &bp); av_log(log_ctx, AV_LOG_ERROR, "Unsupported channel layout in Audio Element id %"PRId64 @@ -267,7 +268,26 @@ int ff_iamf_add_audio_element(IAMFContext *iamf, const AVStreamGroup *stg, void return AVERROR(EINVAL); } } + + if (!i) + continue; + + const AVIAMFLayer *prev_layer = iamf_audio_element->layers[i-1]; + uint64_t prev_mask = av_channel_layout_subset(&prev_layer->ch_layout, UINT64_MAX); + if (av_channel_layout_subset(&layer->ch_layout, prev_mask) != prev_mask || (layer->ch_layout.nb_channels <= + prev_layer->ch_layout.nb_channels)) { + av_bprint_init(&bp, 0, AV_BPRINT_SIZE_AUTOMATIC); + av_bprintf(&bp, "Channel layout \""); + av_channel_layout_describe_bprint(&layer->ch_layout, &bp); + av_bprintf(&bp, "\" can't follow channel layout \""); + av_channel_layout_describe_bprint(&prev_layer->ch_layout, &bp); + av_bprintf(&bp, "\" in Scalable Audio Element id %"PRId64, stg->id); + av_log(log_ctx, AV_LOG_ERROR, "%s\n", bp.str); + av_bprint_finalize(&bp, NULL); + return AVERROR(EINVAL); + } } + } for (int i = 0; i < iamf->nb_audio_elements; i++) { if (stg->id == iamf->audio_elements[i]->audio_element_id) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".