They have the side channels, not back, as defined in ITU-R - BS.2051-3
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavformat/iamf.c | 8 ++++----
tests/ref/fate/iamf-5_1-copy | 4 ++--
tests/ref/fate/iamf-5_1-demux | 4 ++--
tests/ref/fate/iamf-5_1_4 | 4 ++--
tests/ref/fate/mov-mp4-iamf-5_1_4 | 4 ++--
tests/streamgroups/audio_element-5_1_4 | 2 +-
tests/streamgroups/mix_presentation-5_1_4 | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/libavformat/iamf.c b/libavformat/iamf.c
index a01c99ea67..0e17dd592d 100644
--- a/libavformat/iamf.c
+++ b/libavformat/iamf.c
@@ -28,9 +28,9 @@ const AVChannelLayout ff_iamf_scalable_ch_layouts[10] = {
AV_CHANNEL_LAYOUT_MONO,
AV_CHANNEL_LAYOUT_STEREO,
// "Loudspeaker configuration for Sound System B"
- AV_CHANNEL_LAYOUT_5POINT1_BACK,
+ AV_CHANNEL_LAYOUT_5POINT1,
// "Loudspeaker configuration for Sound System C"
- AV_CHANNEL_LAYOUT_5POINT1POINT2_BACK,
+ AV_CHANNEL_LAYOUT_5POINT1POINT2,
// "Loudspeaker configuration for Sound System D"
AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK,
// "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] = {
{ SOUND_SYSTEM_A_0_2_0, AV_CHANNEL_LAYOUT_STEREO },
- { SOUND_SYSTEM_B_0_5_0, AV_CHANNEL_LAYOUT_5POINT1_BACK },
- { SOUND_SYSTEM_C_2_5_0, AV_CHANNEL_LAYOUT_5POINT1POINT2_BACK },
+ { SOUND_SYSTEM_B_0_5_0, AV_CHANNEL_LAYOUT_5POINT1 },
+ { SOUND_SYSTEM_C_2_5_0, AV_CHANNEL_LAYOUT_5POINT1POINT2 },
{ SOUND_SYSTEM_D_4_5_0, AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK },
{ SOUND_SYSTEM_E_4_5_1,
{
diff --git a/tests/ref/fate/iamf-5_1-copy b/tests/ref/fate/iamf-5_1-copy
index ed2046fe3b..5f7d9f98c0 100644
--- a/tests/ref/fate/iamf-5_1-copy
+++ b/tests/ref/fate/iamf-5_1-copy
@@ -37,7 +37,7 @@ output_gain_flags=0
output_gain=0/1
[/SUBCOMPONENT]
[SUBCOMPONENT]
-channel_layout=5.1
+channel_layout=5.1(side)
output_gain_flags=0
output_gain=0/1
[/SUBCOMPONENT]
@@ -209,7 +209,7 @@ dialogue_anchored_loudness=0/1
album_anchored_loudness=0/1
[/PIECE]
[PIECE]
-sound_system=5.1
+sound_system=5.1(side)
integrated_loudness=-5886/256
digital_peak=-2845/256
true_peak=0/1
diff --git a/tests/ref/fate/iamf-5_1-demux b/tests/ref/fate/iamf-5_1-demux
index ed2046fe3b..5f7d9f98c0 100644
--- a/tests/ref/fate/iamf-5_1-demux
+++ b/tests/ref/fate/iamf-5_1-demux
@@ -37,7 +37,7 @@ output_gain_flags=0
output_gain=0/1
[/SUBCOMPONENT]
[SUBCOMPONENT]
-channel_layout=5.1
+channel_layout=5.1(side)
output_gain_flags=0
output_gain=0/1
[/SUBCOMPONENT]
@@ -209,7 +209,7 @@ dialogue_anchored_loudness=0/1
album_anchored_loudness=0/1
[/PIECE]
[PIECE]
-sound_system=5.1
+sound_system=5.1(side)
integrated_loudness=-5886/256
digital_peak=-2845/256
true_peak=0/1
diff --git a/tests/ref/fate/iamf-5_1_4 b/tests/ref/fate/iamf-5_1_4
index fdee50b8e0..1d4c055906 100644
--- a/tests/ref/fate/iamf-5_1_4
+++ b/tests/ref/fate/iamf-5_1_4
@@ -111,7 +111,7 @@ output_gain_flags=0
output_gain=0/1
[/SUBCOMPONENT]
[SUBCOMPONENT]
-channel_layout=5.1
+channel_layout=5.1(side)
output_gain_flags=0
output_gain=0/1
[/SUBCOMPONENT]
@@ -327,7 +327,7 @@ dialogue_anchored_loudness=0/1
album_anchored_loudness=0/1
[/PIECE]
[PIECE]
-sound_system=5.1
+sound_system=5.1(side)
integrated_loudness=0/256
digital_peak=0/256
true_peak=0/1
diff --git a/tests/ref/fate/mov-mp4-iamf-5_1_4
b/tests/ref/fate/mov-mp4-iamf-5_1_4
index 36106528ab..225bbba267 100644
--- a/tests/ref/fate/mov-mp4-iamf-5_1_4
+++ b/tests/ref/fate/mov-mp4-iamf-5_1_4
@@ -111,7 +111,7 @@ output_gain_flags=0
output_gain=0/1
[/SUBCOMPONENT]
[SUBCOMPONENT]
-channel_layout=5.1
+channel_layout=5.1(side)
output_gain_flags=0
output_gain=0/1
[/SUBCOMPONENT]
@@ -349,7 +349,7 @@ dialogue_anchored_loudness=0/1
album_anchored_loudness=0/1
[/PIECE]
[PIECE]
-sound_system=5.1
+sound_system=5.1(side)
integrated_loudness=0/256
digital_peak=0/256
true_peak=0/1
diff --git a/tests/streamgroups/audio_element-5_1_4
b/tests/streamgroups/audio_element-5_1_4
index f537d1dc5d..abab618999 100644
--- a/tests/streamgroups/audio_element-5_1_4
+++ b/tests/streamgroups/audio_element-5_1_4
@@ -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,
recon_gain=parameter_id=101,
layer=ch_layout=stereo,
-layer=ch_layout=5.1,
+layer=ch_layout=5.1(side),
layer=ch_layout=5.1.2,
layer=ch_layout=5.1.4,
diff --git a/tests/streamgroups/mix_presentation-5_1_4
b/tests/streamgroups/mix_presentation-5_1_4
index 36fcd20124..58480fb753 100644
--- a/tests/streamgroups/mix_presentation-5_1_4
+++ b/tests/streamgroups/mix_presentation-5_1_4
@@ -1,2 +1,2 @@
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|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,
--
2.47.1
_______________________________________________
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".
