We can safely export custom channels layout now, so there's no reason to reject
valid layouts defined in this box.
Signed-off-by: James Almer <jamr...@gmail.com>
---
Untested.
libavformat/mov.c | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index ecd29a7d08..d0ee6201a5 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -7925,7 +7925,8 @@ cleanup:
static int mov_read_SA3D(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{
AVStream *st;
- int i, version, type;
+ AVChannelLayout ch_layout = { 0 };
+ int ret, i, version, type;
int ambisonic_order, channel_order, normalization, channel_count;
if (c->fc->nb_streams < 1)
@@ -7975,17 +7976,29 @@ static int mov_read_SA3D(MOVContext *c, AVIOContext
*pb, MOVAtom atom)
return 0;
}
+ ret = av_channel_layout_custom_init(&ch_layout, channel_count);
+ if (ret < 0)
+ return ret;
+
for (i = 0; i < channel_count; i++) {
- if (i != avio_rb32(pb)) {
- av_log(c->fc, AV_LOG_WARNING,
- "Ambisonic channel reordering is not supported\n");
+ unsigned channel = avio_rb32(pb);
+
+ if (channel >= channel_count ||
+ channel > INT_MAX - AV_CHAN_AMBISONIC_BASE) {
+ av_log(c->fc, AV_LOG_ERROR, "Invalid channel index (%d / %d)\n",
+ channel, ambisonic_order);
+ av_channel_layout_uninit(&ch_layout);
return 0;
}
+ ch_layout.u.map[i].id = AV_CHAN_AMBISONIC_BASE + channel;
}
+ ret = av_channel_layout_retype(&ch_layout, 0,
AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL);
+ if (ret < 0)
+ return ret;
+
av_channel_layout_uninit(&st->codecpar->ch_layout);
- st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_AMBISONIC;
- st->codecpar->ch_layout.nb_channels = channel_count;
+ st->codecpar->ch_layout = ch_layout;
return 0;
}
--
2.44.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
