Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avformat/iamf: use the correct layouts for Sound Systems B and C

Browse source 
They have the side channels, not back, as defined in ITU-R - BS.2051-3

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-12-30 15:36:28 -03:00
parent 3fa70c03e4
commit 8f6a1a06a6
8 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libavformat/iamf.c
View file

@ -28,9 +28,9 @@ const AVChannelLayout ff_iamf_scalable_ch_layouts[10] = {
AV_CHANNEL_LAYOUT_MONO, AV_CHANNEL_LAYOUT_MONO,
AV_CHANNEL_LAYOUT_STEREO, AV_CHANNEL_LAYOUT_STEREO,
// "Loudspeaker configuration for Sound System B" // "Loudspeaker configuration for Sound System B"
AV_CHANNEL_LAYOUT_5POINT1_BACK, AV_CHANNEL_LAYOUT_5POINT1,
// "Loudspeaker configuration for Sound System C" // "Loudspeaker configuration for Sound System C"
AV_CHANNEL_LAYOUT_5POINT1POINT2_BACK, AV_CHANNEL_LAYOUT_5POINT1POINT2,
// "Loudspeaker configuration for Sound System D" // "Loudspeaker configuration for Sound System D"
AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK, AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK,
// "Loudspeaker configuration for Sound System I" // "Loudspeaker configuration for Sound System I"
@ -106,8 +106,8 @@ const AVChannelLayout ff_iamf_expanded_scalable_ch_layouts[13] = {
const struct IAMFSoundSystemMap ff_iamf_sound_system_map[14] = { const struct IAMFSoundSystemMap ff_iamf_sound_system_map[14] = {
{ SOUND_SYSTEM_A_0_2_0, AV_CHANNEL_LAYOUT_STEREO }, { SOUND_SYSTEM_A_0_2_0, AV_CHANNEL_LAYOUT_STEREO },
{ SOUND_SYSTEM_B_0_5_0, AV_CHANNEL_LAYOUT_5POINT1_BACK }, { SOUND_SYSTEM_B_0_5_0, AV_CHANNEL_LAYOUT_5POINT1 },
{ SOUND_SYSTEM_C_2_5_0, AV_CHANNEL_LAYOUT_5POINT1POINT2_BACK }, { SOUND_SYSTEM_C_2_5_0, AV_CHANNEL_LAYOUT_5POINT1POINT2 },
{ SOUND_SYSTEM_D_4_5_0, AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK }, { SOUND_SYSTEM_D_4_5_0, AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK },
{ SOUND_SYSTEM_E_4_5_1, { SOUND_SYSTEM_E_4_5_1,
{ {

2
libavformat/version.h
View file

@ -32,7 +32,7 @@
#include "version_major.h" #include "version_major.h"
#define LIBAVFORMAT_VERSION_MINOR 9 #define LIBAVFORMAT_VERSION_MINOR 9
#define LIBAVFORMAT_VERSION_MICRO 102 #define LIBAVFORMAT_VERSION_MICRO 103
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \

4
tests/ref/fate/iamf-5_1-copy
View file

@ -37,7 +37,7 @@ output_gain_flags=0
output_gain=0/1 output_gain=0/1
[/SUBCOMPONENT] [/SUBCOMPONENT]
[SUBCOMPONENT] [SUBCOMPONENT]
channel_layout=5.1 channel_layout=5.1(side)
output_gain_flags=0 output_gain_flags=0
output_gain=0/1 output_gain=0/1
[/SUBCOMPONENT] [/SUBCOMPONENT]
@ -209,7 +209,7 @@ dialogue_anchored_loudness=0/1
album_anchored_loudness=0/1 album_anchored_loudness=0/1
[/PIECE] [/PIECE]
[PIECE] [PIECE]
sound_system=5.1 sound_system=5.1(side)
integrated_loudness=-5886/256 integrated_loudness=-5886/256
digital_peak=-2845/256 digital_peak=-2845/256
true_peak=0/1 true_peak=0/1

4
tests/ref/fate/iamf-5_1-demux
View file

@ -37,7 +37,7 @@ output_gain_flags=0
output_gain=0/1 output_gain=0/1
[/SUBCOMPONENT] [/SUBCOMPONENT]
[SUBCOMPONENT] [SUBCOMPONENT]
channel_layout=5.1 channel_layout=5.1(side)
output_gain_flags=0 output_gain_flags=0
output_gain=0/1 output_gain=0/1
[/SUBCOMPONENT] [/SUBCOMPONENT]
@ -209,7 +209,7 @@ dialogue_anchored_loudness=0/1
album_anchored_loudness=0/1 album_anchored_loudness=0/1
[/PIECE] [/PIECE]
[PIECE] [PIECE]
sound_system=5.1 sound_system=5.1(side)
integrated_loudness=-5886/256 integrated_loudness=-5886/256
digital_peak=-2845/256 digital_peak=-2845/256
true_peak=0/1 true_peak=0/1

8
tests/ref/fate/iamf-5_1_4
View file

@ -111,12 +111,12 @@ output_gain_flags=0
output_gain=0/1 output_gain=0/1
[/SUBCOMPONENT] [/SUBCOMPONENT]
[SUBCOMPONENT] [SUBCOMPONENT]
channel_layout=5.1 channel_layout=5.1(side)
output_gain_flags=0 output_gain_flags=0
output_gain=0/1 output_gain=0/1
[/SUBCOMPONENT] [/SUBCOMPONENT]
[SUBCOMPONENT] [SUBCOMPONENT]
channel_layout=5.1.2(back) channel_layout=5.1.2
output_gain_flags=0 output_gain_flags=0
output_gain=0/1 output_gain=0/1
[/SUBCOMPONENT] [/SUBCOMPONENT]
@ -327,7 +327,7 @@ dialogue_anchored_loudness=0/1
album_anchored_loudness=0/1 album_anchored_loudness=0/1
[/PIECE] [/PIECE]
[PIECE] [PIECE]
sound_system=5.1 sound_system=5.1(side)
integrated_loudness=0/256 integrated_loudness=0/256
digital_peak=0/256 digital_peak=0/256
true_peak=0/1 true_peak=0/1
@ -335,7 +335,7 @@ dialogue_anchored_loudness=0/1
album_anchored_loudness=0/1 album_anchored_loudness=0/1
[/PIECE] [/PIECE]
[PIECE] [PIECE]
sound_system=5.1.2(back) sound_system=5.1.2
integrated_loudness=0/256 integrated_loudness=0/256
digital_peak=0/256 digital_peak=0/256
true_peak=0/1 true_peak=0/1

8
tests/ref/fate/mov-mp4-iamf-5_1_4
View file

@ -111,12 +111,12 @@ output_gain_flags=0
output_gain=0/1 output_gain=0/1
[/SUBCOMPONENT] [/SUBCOMPONENT]
[SUBCOMPONENT] [SUBCOMPONENT]
channel_layout=5.1 channel_layout=5.1(side)
output_gain_flags=0 output_gain_flags=0
output_gain=0/1 output_gain=0/1
[/SUBCOMPONENT] [/SUBCOMPONENT]
[SUBCOMPONENT] [SUBCOMPONENT]
channel_layout=5.1.2(back) channel_layout=5.1.2
output_gain_flags=0 output_gain_flags=0
output_gain=0/1 output_gain=0/1
[/SUBCOMPONENT] [/SUBCOMPONENT]
@ -349,7 +349,7 @@ dialogue_anchored_loudness=0/1
album_anchored_loudness=0/1 album_anchored_loudness=0/1
[/PIECE] [/PIECE]
[PIECE] [PIECE]
sound_system=5.1 sound_system=5.1(side)
integrated_loudness=0/256 integrated_loudness=0/256
digital_peak=0/256 digital_peak=0/256
true_peak=0/1 true_peak=0/1
@ -357,7 +357,7 @@ dialogue_anchored_loudness=0/1
album_anchored_loudness=0/1 album_anchored_loudness=0/1
[/PIECE] [/PIECE]
[PIECE] [PIECE]
sound_system=5.1.2(back) sound_system=5.1.2
integrated_loudness=0/256 integrated_loudness=0/256
digital_peak=0/256 digital_peak=0/256
true_peak=0/1 true_peak=0/1

4
tests/streamgroups/audio_element-5_1_4
View file

@ -2,6 +2,6 @@ type=iamf_audio_element:id=1:st=0:st=1:st=2:st=3:st=4:st=5:default_w=10,
demixing=dmixp_mode=1:parameter_id=998, demixing=dmixp_mode=1:parameter_id=998,
recon_gain=parameter_id=101, recon_gain=parameter_id=101,
layer=ch_layout=stereo, layer=ch_layout=stereo,
layer=ch_layout=5.1, layer=ch_layout=5.1(side),
layer=ch_layout=5.1.2(back), layer=ch_layout=5.1.2,
layer=ch_layout=5.1.4, layer=ch_layout=5.1.4,

2
tests/streamgroups/mix_presentation-5_1_4
View file

@ -1,2 +1,2 @@
type=iamf_mix_presentation:id=2:stg=0:annotations=en-us=Mix_Presentation, type=iamf_mix_presentation:id=2:stg=0:annotations=en-us=Mix_Presentation,
submix=parameter_id=100:parameter_rate=48000:default_mix_gain=1.0|element=stg=0:parameter_id=100:headphones_rendering_mode=stereo:annotations=en-us=Scalable_Submix|layout=sound_system=stereo:integrated_loudness=1.0|layout=sound_system=5.1|layout=sound_system=5.1.2(back)|layout=sound_system=5.1.4, submix=parameter_id=100:parameter_rate=48000:default_mix_gain=1.0|element=stg=0:parameter_id=100:headphones_rendering_mode=stereo:annotations=en-us=Scalable_Submix|layout=sound_system=stereo:integrated_loudness=1.0|layout=sound_system=5.1(side)|layout=sound_system=5.1.2|layout=sound_system=5.1.4,