History

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

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

James Almer committed 1 year ago

Commit 8f6a1a01 parent 3fa70c08 files · +20 −20Browse files

Unified · Split

8 files
  1. libavformat/iamf.c +4 −4
  2. libavformat/version.h +1 −1
  3. tests/ref/fate/iamf-5_1-copy +2 −2
  4. tests/ref/fate/iamf-5_1-demux +2 −2
  5. tests/ref/fate/iamf-5_1_4 +4 −4
  6. tests/ref/fate/mov-mp4-iamf-5_1_4 +4 −4
  7. tests/streamgroups/audio_element-5_1_4 +2 −2
  8. tests/streamgroups/mix_presentation-5_1_4 +1 −1
libavformat/iamf.c+4−4
@@ -28,9 +28,9 @@ const AVChannelLayout ff_iamf_scalable_ch_layouts[10] = { · 27 unmodified lines
2828 AV_CHANNEL_LAYOUT_MONO,
2929 AV_CHANNEL_LAYOUT_STEREO,
3030 // "Loudspeaker configuration for Sound System B"
31− AV_CHANNEL_LAYOUT_5POINT1_BACK,
31+ AV_CHANNEL_LAYOUT_5POINT1,
3232 // "Loudspeaker configuration for Sound System C"
33− AV_CHANNEL_LAYOUT_5POINT1POINT2_BACK,
33+ AV_CHANNEL_LAYOUT_5POINT1POINT2,
3434 // "Loudspeaker configuration for Sound System D"
3535 AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK,
3636 // "Loudspeaker configuration for Sound System I"
@@ -106,8 +106,8 @@ const AVChannelLayout ff_iamf_expanded_scalable_ch_layouts[13] = { · 69 unmodified lines
106106
107107 const struct IAMFSoundSystemMap ff_iamf_sound_system_map[14] = {
108108 { SOUND_SYSTEM_A_0_2_0, AV_CHANNEL_LAYOUT_STEREO },
109− { SOUND_SYSTEM_B_0_5_0, AV_CHANNEL_LAYOUT_5POINT1_BACK },
110− { SOUND_SYSTEM_C_2_5_0, AV_CHANNEL_LAYOUT_5POINT1POINT2_BACK },
109+ { SOUND_SYSTEM_B_0_5_0, AV_CHANNEL_LAYOUT_5POINT1 },
110+ { SOUND_SYSTEM_C_2_5_0, AV_CHANNEL_LAYOUT_5POINT1POINT2 },
111111 { SOUND_SYSTEM_D_4_5_0, AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK },
112112 { SOUND_SYSTEM_E_4_5_1,
113113 {
libavformat/version.h+1−1
@@ -32,7 +32,7 @@ · 31 unmodified lines
3232 #include "version_major.h"
3333
3434 #define LIBAVFORMAT_VERSION_MINOR 9
35−#define LIBAVFORMAT_VERSION_MICRO 102
35+#define LIBAVFORMAT_VERSION_MICRO 103
3636
3737 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
3838 LIBAVFORMAT_VERSION_MINOR, \
tests/ref/fate/iamf-5_1-copy+2−2
@@ -37,7 +37,7 @@ output_gain_flags=0 · 36 unmodified lines
3737 output_gain=0/1
3838 [/SUBCOMPONENT]
3939 [SUBCOMPONENT]
40−channel_layout=5.1
40+channel_layout=5.1(side)
4141 output_gain_flags=0
4242 output_gain=0/1
4343 [/SUBCOMPONENT]
@@ -209,7 +209,7 @@ dialogue_anchored_loudness=0/1 · 165 unmodified lines
209209 album_anchored_loudness=0/1
210210 [/PIECE]
211211 [PIECE]
212−sound_system=5.1
212+sound_system=5.1(side)
213213 integrated_loudness=-5886/256
214214 digital_peak=-2845/256
215215 true_peak=0/1
tests/ref/fate/iamf-5_1-demux+2−2
@@ -37,7 +37,7 @@ output_gain_flags=0 · 36 unmodified lines
3737 output_gain=0/1
3838 [/SUBCOMPONENT]
3939 [SUBCOMPONENT]
40−channel_layout=5.1
40+channel_layout=5.1(side)
4141 output_gain_flags=0
4242 output_gain=0/1
4343 [/SUBCOMPONENT]
@@ -209,7 +209,7 @@ dialogue_anchored_loudness=0/1 · 165 unmodified lines
209209 album_anchored_loudness=0/1
210210 [/PIECE]
211211 [PIECE]
212−sound_system=5.1
212+sound_system=5.1(side)
213213 integrated_loudness=-5886/256
214214 digital_peak=-2845/256
215215 true_peak=0/1
tests/ref/fate/iamf-5_1_4+4−4
@@ -111,12 +111,12 @@ output_gain_flags=0 · 110 unmodified lines
111111 output_gain=0/1
112112 [/SUBCOMPONENT]
113113 [SUBCOMPONENT]
114−channel_layout=5.1
114+channel_layout=5.1(side)
115115 output_gain_flags=0
116116 output_gain=0/1
117117 [/SUBCOMPONENT]
118118 [SUBCOMPONENT]
119−channel_layout=5.1.2(back)
119+channel_layout=5.1.2
120120 output_gain_flags=0
121121 output_gain=0/1
122122 [/SUBCOMPONENT]
@@ -327,7 +327,7 @@ dialogue_anchored_loudness=0/1 · 204 unmodified lines
327327 album_anchored_loudness=0/1
328328 [/PIECE]
329329 [PIECE]
330−sound_system=5.1
330+sound_system=5.1(side)
331331 integrated_loudness=0/256
332332 digital_peak=0/256
333333 true_peak=0/1
@@ -335,7 +335,7 @@ dialogue_anchored_loudness=0/1 · 1 unmodified line
335335 album_anchored_loudness=0/1
336336 [/PIECE]
337337 [PIECE]
338−sound_system=5.1.2(back)
338+sound_system=5.1.2
339339 integrated_loudness=0/256
340340 digital_peak=0/256
341341 true_peak=0/1
tests/ref/fate/mov-mp4-iamf-5_1_4+4−4
@@ -111,12 +111,12 @@ output_gain_flags=0 · 110 unmodified lines
111111 output_gain=0/1
112112 [/SUBCOMPONENT]
113113 [SUBCOMPONENT]
114−channel_layout=5.1
114+channel_layout=5.1(side)
115115 output_gain_flags=0
116116 output_gain=0/1
117117 [/SUBCOMPONENT]
118118 [SUBCOMPONENT]
119−channel_layout=5.1.2(back)
119+channel_layout=5.1.2
120120 output_gain_flags=0
121121 output_gain=0/1
122122 [/SUBCOMPONENT]
@@ -349,7 +349,7 @@ dialogue_anchored_loudness=0/1 · 226 unmodified lines
349349 album_anchored_loudness=0/1
350350 [/PIECE]
351351 [PIECE]
352−sound_system=5.1
352+sound_system=5.1(side)
353353 integrated_loudness=0/256
354354 digital_peak=0/256
355355 true_peak=0/1
@@ -357,7 +357,7 @@ dialogue_anchored_loudness=0/1 · 1 unmodified line
357357 album_anchored_loudness=0/1
358358 [/PIECE]
359359 [PIECE]
360−sound_system=5.1.2(back)
360+sound_system=5.1.2
361361 integrated_loudness=0/256
362362 digital_peak=0/256
363363 true_peak=0/1
tests/streamgroups/audio_element-5_1_4+2−2
@@ -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, · 1 unmodified line
22 demixing=dmixp_mode=1:parameter_id=998,
33 recon_gain=parameter_id=101,
44 layer=ch_layout=stereo,
5−layer=ch_layout=5.1,
6−layer=ch_layout=5.1.2(back),
5+layer=ch_layout=5.1(side),
6+layer=ch_layout=5.1.2,
77 layer=ch_layout=5.1.4,
tests/streamgroups/mix_presentation-5_1_4+1−1
@@ -1,2 +1,2 @@
11 type=iamf_mix_presentation:id=2:stg=0:annotations=en-us=Mix_Presentation,
2−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,
2+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,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t