They have the side channels, not back, as defined in ITU-R - BS.2051-3
Unified · Split
| @@ -28,9 +28,9 @@ const AVChannelLayout ff_iamf_scalable_ch_layouts[10] = { · 27 unmodified lines | |||
| 28 | AV_CHANNEL_LAYOUT_MONO, | 28 | AV_CHANNEL_LAYOUT_MONO, |
| 29 | AV_CHANNEL_LAYOUT_STEREO, | 29 | AV_CHANNEL_LAYOUT_STEREO, |
| 30 | // "Loudspeaker configuration for Sound System B" | 30 | // "Loudspeaker configuration for Sound System B" |
| 31 | AV_CHANNEL_LAYOUT_5POINT1_BACK, | 31 | AV_CHANNEL_LAYOUT_5POINT1, |
| 32 | // "Loudspeaker configuration for Sound System C" | 32 | // "Loudspeaker configuration for Sound System C" |
| 33 | AV_CHANNEL_LAYOUT_5POINT1POINT2_BACK, | 33 | AV_CHANNEL_LAYOUT_5POINT1POINT2, |
| 34 | // "Loudspeaker configuration for Sound System D" | 34 | // "Loudspeaker configuration for Sound System D" |
| 35 | AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK, | 35 | AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK, |
| 36 | // "Loudspeaker configuration for Sound System I" | 36 | // "Loudspeaker configuration for Sound System I" |
| @@ -106,8 +106,8 @@ const AVChannelLayout ff_iamf_expanded_scalable_ch_layouts[13] = { · 69 unmodified lines | |||
| 106 | 106 | ||
| 107 | const struct IAMFSoundSystemMap ff_iamf_sound_system_map[14] = { | 107 | const struct IAMFSoundSystemMap ff_iamf_sound_system_map[14] = { |
| 108 | { SOUND_SYSTEM_A_0_2_0, AV_CHANNEL_LAYOUT_STEREO }, | 108 | { SOUND_SYSTEM_A_0_2_0, AV_CHANNEL_LAYOUT_STEREO }, |
| 109 | { SOUND_SYSTEM_B_0_5_0, AV_CHANNEL_LAYOUT_5POINT1_BACK }, | 109 | { SOUND_SYSTEM_B_0_5_0, AV_CHANNEL_LAYOUT_5POINT1 }, |
| 110 | { SOUND_SYSTEM_C_2_5_0, AV_CHANNEL_LAYOUT_5POINT1POINT2_BACK }, | 110 | { SOUND_SYSTEM_C_2_5_0, AV_CHANNEL_LAYOUT_5POINT1POINT2 }, |
| 111 | { SOUND_SYSTEM_D_4_5_0, AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK }, | 111 | { SOUND_SYSTEM_D_4_5_0, AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK }, |
| 112 | { SOUND_SYSTEM_E_4_5_1, | 112 | { SOUND_SYSTEM_E_4_5_1, |
| 113 | { | 113 | { |
| @@ -32,7 +32,7 @@ · 31 unmodified lines | |||
| 32 | #include "version_major.h" | 32 | #include "version_major.h" |
| 33 | 33 | ||
| 34 | #define LIBAVFORMAT_VERSION_MINOR 9 | 34 | #define LIBAVFORMAT_VERSION_MINOR 9 |
| 35 | #define LIBAVFORMAT_VERSION_MICRO 102 | 35 | #define LIBAVFORMAT_VERSION_MICRO 103 |
| 36 | 36 | ||
| 37 | #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ | 37 | #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |
| 38 | LIBAVFORMAT_VERSION_MINOR, \ | 38 | LIBAVFORMAT_VERSION_MINOR, \ |
| @@ -37,7 +37,7 @@ output_gain_flags=0 · 36 unmodified lines | |||
| 37 | output_gain=0/1 | 37 | output_gain=0/1 |
| 38 | [/SUBCOMPONENT] | 38 | [/SUBCOMPONENT] |
| 39 | [SUBCOMPONENT] | 39 | [SUBCOMPONENT] |
| 40 | channel_layout=5.1 | 40 | channel_layout=5.1(side) |
| 41 | output_gain_flags=0 | 41 | output_gain_flags=0 |
| 42 | output_gain=0/1 | 42 | output_gain=0/1 |
| 43 | [/SUBCOMPONENT] | 43 | [/SUBCOMPONENT] |
| @@ -209,7 +209,7 @@ dialogue_anchored_loudness=0/1 · 165 unmodified lines | |||
| 209 | album_anchored_loudness=0/1 | 209 | album_anchored_loudness=0/1 |
| 210 | [/PIECE] | 210 | [/PIECE] |
| 211 | [PIECE] | 211 | [PIECE] |
| 212 | sound_system=5.1 | 212 | sound_system=5.1(side) |
| 213 | integrated_loudness=-5886/256 | 213 | integrated_loudness=-5886/256 |
| 214 | digital_peak=-2845/256 | 214 | digital_peak=-2845/256 |
| 215 | true_peak=0/1 | 215 | true_peak=0/1 |
| @@ -37,7 +37,7 @@ output_gain_flags=0 · 36 unmodified lines | |||
| 37 | output_gain=0/1 | 37 | output_gain=0/1 |
| 38 | [/SUBCOMPONENT] | 38 | [/SUBCOMPONENT] |
| 39 | [SUBCOMPONENT] | 39 | [SUBCOMPONENT] |
| 40 | channel_layout=5.1 | 40 | channel_layout=5.1(side) |
| 41 | output_gain_flags=0 | 41 | output_gain_flags=0 |
| 42 | output_gain=0/1 | 42 | output_gain=0/1 |
| 43 | [/SUBCOMPONENT] | 43 | [/SUBCOMPONENT] |
| @@ -209,7 +209,7 @@ dialogue_anchored_loudness=0/1 · 165 unmodified lines | |||
| 209 | album_anchored_loudness=0/1 | 209 | album_anchored_loudness=0/1 |
| 210 | [/PIECE] | 210 | [/PIECE] |
| 211 | [PIECE] | 211 | [PIECE] |
| 212 | sound_system=5.1 | 212 | sound_system=5.1(side) |
| 213 | integrated_loudness=-5886/256 | 213 | integrated_loudness=-5886/256 |
| 214 | digital_peak=-2845/256 | 214 | digital_peak=-2845/256 |
| 215 | true_peak=0/1 | 215 | true_peak=0/1 |
| @@ -111,12 +111,12 @@ output_gain_flags=0 · 110 unmodified lines | |||
| 111 | output_gain=0/1 | 111 | output_gain=0/1 |
| 112 | [/SUBCOMPONENT] | 112 | [/SUBCOMPONENT] |
| 113 | [SUBCOMPONENT] | 113 | [SUBCOMPONENT] |
| 114 | channel_layout=5.1 | 114 | channel_layout=5.1(side) |
| 115 | output_gain_flags=0 | 115 | output_gain_flags=0 |
| 116 | output_gain=0/1 | 116 | output_gain=0/1 |
| 117 | [/SUBCOMPONENT] | 117 | [/SUBCOMPONENT] |
| 118 | [SUBCOMPONENT] | 118 | [SUBCOMPONENT] |
| 119 | channel_layout=5.1.2(back) | 119 | channel_layout=5.1.2 |
| 120 | output_gain_flags=0 | 120 | output_gain_flags=0 |
| 121 | output_gain=0/1 | 121 | output_gain=0/1 |
| 122 | [/SUBCOMPONENT] | 122 | [/SUBCOMPONENT] |
| @@ -327,7 +327,7 @@ dialogue_anchored_loudness=0/1 · 204 unmodified lines | |||
| 327 | album_anchored_loudness=0/1 | 327 | album_anchored_loudness=0/1 |
| 328 | [/PIECE] | 328 | [/PIECE] |
| 329 | [PIECE] | 329 | [PIECE] |
| 330 | sound_system=5.1 | 330 | sound_system=5.1(side) |
| 331 | integrated_loudness=0/256 | 331 | integrated_loudness=0/256 |
| 332 | digital_peak=0/256 | 332 | digital_peak=0/256 |
| 333 | true_peak=0/1 | 333 | true_peak=0/1 |
| @@ -335,7 +335,7 @@ dialogue_anchored_loudness=0/1 · 1 unmodified line | |||
| 335 | album_anchored_loudness=0/1 | 335 | album_anchored_loudness=0/1 |
| 336 | [/PIECE] | 336 | [/PIECE] |
| 337 | [PIECE] | 337 | [PIECE] |
| 338 | sound_system=5.1.2(back) | 338 | sound_system=5.1.2 |
| 339 | integrated_loudness=0/256 | 339 | integrated_loudness=0/256 |
| 340 | digital_peak=0/256 | 340 | digital_peak=0/256 |
| 341 | true_peak=0/1 | 341 | true_peak=0/1 |
| @@ -111,12 +111,12 @@ output_gain_flags=0 · 110 unmodified lines | |||
| 111 | output_gain=0/1 | 111 | output_gain=0/1 |
| 112 | [/SUBCOMPONENT] | 112 | [/SUBCOMPONENT] |
| 113 | [SUBCOMPONENT] | 113 | [SUBCOMPONENT] |
| 114 | channel_layout=5.1 | 114 | channel_layout=5.1(side) |
| 115 | output_gain_flags=0 | 115 | output_gain_flags=0 |
| 116 | output_gain=0/1 | 116 | output_gain=0/1 |
| 117 | [/SUBCOMPONENT] | 117 | [/SUBCOMPONENT] |
| 118 | [SUBCOMPONENT] | 118 | [SUBCOMPONENT] |
| 119 | channel_layout=5.1.2(back) | 119 | channel_layout=5.1.2 |
| 120 | output_gain_flags=0 | 120 | output_gain_flags=0 |
| 121 | output_gain=0/1 | 121 | output_gain=0/1 |
| 122 | [/SUBCOMPONENT] | 122 | [/SUBCOMPONENT] |
| @@ -349,7 +349,7 @@ dialogue_anchored_loudness=0/1 · 226 unmodified lines | |||
| 349 | album_anchored_loudness=0/1 | 349 | album_anchored_loudness=0/1 |
| 350 | [/PIECE] | 350 | [/PIECE] |
| 351 | [PIECE] | 351 | [PIECE] |
| 352 | sound_system=5.1 | 352 | sound_system=5.1(side) |
| 353 | integrated_loudness=0/256 | 353 | integrated_loudness=0/256 |
| 354 | digital_peak=0/256 | 354 | digital_peak=0/256 |
| 355 | true_peak=0/1 | 355 | true_peak=0/1 |
| @@ -357,7 +357,7 @@ dialogue_anchored_loudness=0/1 · 1 unmodified line | |||
| 357 | album_anchored_loudness=0/1 | 357 | album_anchored_loudness=0/1 |
| 358 | [/PIECE] | 358 | [/PIECE] |
| 359 | [PIECE] | 359 | [PIECE] |
| 360 | sound_system=5.1.2(back) | 360 | sound_system=5.1.2 |
| 361 | integrated_loudness=0/256 | 361 | integrated_loudness=0/256 |
| 362 | digital_peak=0/256 | 362 | digital_peak=0/256 |
| 363 | true_peak=0/1 | 363 | true_peak=0/1 |
| @@ -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 | |||
| 2 | demixing=dmixp_mode=1:parameter_id=998, | 2 | demixing=dmixp_mode=1:parameter_id=998, |
| 3 | recon_gain=parameter_id=101, | 3 | recon_gain=parameter_id=101, |
| 4 | layer=ch_layout=stereo, | 4 | layer=ch_layout=stereo, |
| 5 | layer=ch_layout=5.1, | 5 | layer=ch_layout=5.1(side), |
| 6 | layer=ch_layout=5.1.2(back), | 6 | layer=ch_layout=5.1.2, |
| 7 | layer=ch_layout=5.1.4, | 7 | layer=ch_layout=5.1.4, |
| @@ -1,2 +1,2 @@ | |||
| 1 | type=iamf_mix_presentation:id=2:stg=0:annotations=en-us=Mix_Presentation, | 1 | 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, |