virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

avformat/mov: support SpatialAudioBox ambisonic layouts with non-diegetic channels

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-04-26 11:50:09 -03:00
parent 37c8d93e56
commit b7debef3cc
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/mov.c
View File

@ -7928,6 +7928,7 @@ static int mov_read_SA3D(MOVContext *c, AVIOContext *pb, MOVAtom atom)
AVChannelLayout ch_layout = { 0 }; AVChannelLayout ch_layout = { 0 };
int ret, i, version, type; int ret, i, version, type;
int ambisonic_order, channel_order, normalization, channel_count; int ambisonic_order, channel_order, normalization, channel_count;
int ambi_channels, non_diegetic_channels;
if (c->fc->nb_streams < 1) if (c->fc->nb_streams < 1)
return 0; return 0;
@ -7946,11 +7947,12 @@ static int mov_read_SA3D(MOVContext *c, AVIOContext *pb, MOVAtom atom)
} }
type = avio_r8(pb); type = avio_r8(pb);
if (type) { if (type & 0x7f) {
av_log(c->fc, AV_LOG_WARNING, av_log(c->fc, AV_LOG_WARNING,
"Unsupported ambisonic type %d\n", type); "Unsupported ambisonic type %d\n", type & 0x7f);
return 0; return 0;
} }
non_diegetic_channels = (type >> 7) * 2; // head_locked_stereo
ambisonic_order = avio_rb32(pb); ambisonic_order = avio_rb32(pb);
@ -7970,12 +7972,14 @@ static int mov_read_SA3D(MOVContext *c, AVIOContext *pb, MOVAtom atom)
channel_count = avio_rb32(pb); channel_count = avio_rb32(pb);
if (ambisonic_order < 0 || ambisonic_order > 31 || if (ambisonic_order < 0 || ambisonic_order > 31 ||
channel_count != (ambisonic_order + 1LL) * (ambisonic_order + 1LL)) { channel_count != ((ambisonic_order + 1LL) * (ambisonic_order + 1LL) +
non_diegetic_channels)) {
av_log(c->fc, AV_LOG_ERROR, av_log(c->fc, AV_LOG_ERROR,
"Invalid number of channels (%d / %d)\n", "Invalid number of channels (%d / %d)\n",
channel_count, ambisonic_order); channel_count, ambisonic_order);
return 0; return 0;
} }
ambi_channels = channel_count - non_diegetic_channels;
ret = av_channel_layout_custom_init(&ch_layout, channel_count); ret = av_channel_layout_custom_init(&ch_layout, channel_count);
if (ret < 0) if (ret < 0)
@ -7990,7 +7994,10 @@ static int mov_read_SA3D(MOVContext *c, AVIOContext *pb, MOVAtom atom)
av_channel_layout_uninit(&ch_layout); av_channel_layout_uninit(&ch_layout);
return 0; return 0;
} }
ch_layout.u.map[i].id = AV_CHAN_AMBISONIC_BASE + channel; if (channel >= ambi_channels)
ch_layout.u.map[i].id = channel - ambi_channels;
else
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); ret = av_channel_layout_retype(&ch_layout, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL);