Signed-off-by: James Almer <jamr...@gmail.com>
---
libavformat/movenc.c | 61 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 61 insertions(+)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index f907f67752..2aec9a8d17 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -916,6 +916,62 @@ static int mov_write_dmlp_tag(AVFormatContext *s,
AVIOContext *pb, MOVTrack *tra
return update_size(pb, pos);
}
+static int mov_write_SA3D_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack
*track)
+{
+ AVChannelLayout ch_layout = { 0 };
+ const AVDictionaryEntry *str = av_dict_get(track->st->metadata, "SA3D",
NULL, 0);
+ int64_t pos;
+ int ambisonic_order, ambi_channels, non_diegetic_channels;
+ int i, ret;
+
+ if (!str)
+ return 0;
+
+ ret = av_channel_layout_from_string(&ch_layout, str->value);
+ if (ret < 0) {
+ if (ret == AVERROR(EINVAL)) {
+invalid:
+ av_log(s, AV_LOG_ERROR, "Invalid SA3D layout: \"%s\"\n",
str->value);
+ ret = 0;
+ }
+ av_channel_layout_uninit(&ch_layout);
+ return ret;
+ }
+
+ if (track->st->codecpar->ch_layout.nb_channels != ch_layout.nb_channels)
+ goto invalid;
+
+ ambisonic_order = av_channel_layout_get_ambisonic_order(&ch_layout);
+ if (ambisonic_order < 0)
+ goto invalid;
+
+ ambi_channels = (ambisonic_order + 1LL) * (ambisonic_order + 1LL);
+ non_diegetic_channels = ch_layout.nb_channels - ambi_channels;
+ if (non_diegetic_channels && non_diegetic_channels != 2)
+ goto invalid;
+
+ av_log(s, AV_LOG_VERBOSE, "Inserting SA3D box with layout: \"%s\"\n",
str->value);
+
+ pos = avio_tell(pb);
+
+ avio_wb32(pb, 0); // Size
+ ffio_wfourcc(pb, "SA3D");
+ avio_w8(pb, 0); // version
+ avio_w8(pb, (!!non_diegetic_channels) << 7); // head_locked_stereo and
ambisonic_type
+ avio_wb32(pb, ambisonic_order); // ambisonic_order
+ avio_w8(pb, 0); // ambisonic_channel_ordering
+ avio_w8(pb, 0); // ambisonic_normalization
+ avio_wb32(pb, ch_layout.nb_channels); // num_channels
+ for (i = 0; i < ambi_channels; i++)
+ avio_wb32(pb, av_channel_layout_channel_from_index(&ch_layout, i) -
AV_CHAN_AMBISONIC_BASE);
+ for (; i < ch_layout.nb_channels; i++)
+ avio_wb32(pb, i);
+
+ av_channel_layout_uninit(&ch_layout);
+
+ return update_size(pb, pos);
+}
+
static int mov_write_chan_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack
*track)
{
uint32_t layout_tag, bitmap, *channel_desc;
@@ -1419,6 +1475,11 @@ static int mov_write_audio_tag(AVFormatContext *s,
AVIOContext *pb, MOVMuxContex
if (ret < 0)
return ret;
+ if (track->mode == MODE_MP4 && track->par->codec_type == AVMEDIA_TYPE_AUDIO
+ && ((ret = mov_write_SA3D_tag(s, pb, track)) < 0)) {
+ return ret;
+ }
+
if (track->mode == MODE_MOV && track->par->codec_type == AVMEDIA_TYPE_AUDIO
&& ((ret = mov_write_chan_tag(s, pb, track)) < 0)) {
return ret;
--
2.45.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".
