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
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
107const struct IAMFSoundSystemMap ff_iamf_sound_system_map[14] = {107const 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 {
libavformat/version.h+1−1
@@ -32,7 +32,7 @@ · 31 unmodified lines
32#include "version_major.h"32#include "version_major.h"
33 33
34#define LIBAVFORMAT_VERSION_MINOR 934#define LIBAVFORMAT_VERSION_MINOR 9
35#define LIBAVFORMAT_VERSION_MICRO 10235#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, \
tests/ref/fate/iamf-5_1-copy+2−2
@@ -37,7 +37,7 @@ output_gain_flags=0 · 36 unmodified lines
37output_gain=0/137output_gain=0/1
38[/SUBCOMPONENT]38[/SUBCOMPONENT]
39[SUBCOMPONENT]39[SUBCOMPONENT]
40channel_layout=5.140channel_layout=5.1(side)
41output_gain_flags=041output_gain_flags=0
42output_gain=0/142output_gain=0/1
43[/SUBCOMPONENT]43[/SUBCOMPONENT]
@@ -209,7 +209,7 @@ dialogue_anchored_loudness=0/1 · 165 unmodified lines
209album_anchored_loudness=0/1209album_anchored_loudness=0/1
210[/PIECE]210[/PIECE]
211[PIECE]211[PIECE]
212sound_system=5.1212sound_system=5.1(side)
213integrated_loudness=-5886/256213integrated_loudness=-5886/256
214digital_peak=-2845/256214digital_peak=-2845/256
215true_peak=0/1215true_peak=0/1
tests/ref/fate/iamf-5_1-demux+2−2
@@ -37,7 +37,7 @@ output_gain_flags=0 · 36 unmodified lines
37output_gain=0/137output_gain=0/1
38[/SUBCOMPONENT]38[/SUBCOMPONENT]
39[SUBCOMPONENT]39[SUBCOMPONENT]
40channel_layout=5.140channel_layout=5.1(side)
41output_gain_flags=041output_gain_flags=0
42output_gain=0/142output_gain=0/1
43[/SUBCOMPONENT]43[/SUBCOMPONENT]
@@ -209,7 +209,7 @@ dialogue_anchored_loudness=0/1 · 165 unmodified lines
209album_anchored_loudness=0/1209album_anchored_loudness=0/1
210[/PIECE]210[/PIECE]
211[PIECE]211[PIECE]
212sound_system=5.1212sound_system=5.1(side)
213integrated_loudness=-5886/256213integrated_loudness=-5886/256
214digital_peak=-2845/256214digital_peak=-2845/256
215true_peak=0/1215true_peak=0/1
tests/ref/fate/iamf-5_1_4+4−4
@@ -111,12 +111,12 @@ output_gain_flags=0 · 110 unmodified lines
111output_gain=0/1111output_gain=0/1
112[/SUBCOMPONENT]112[/SUBCOMPONENT]
113[SUBCOMPONENT]113[SUBCOMPONENT]
114channel_layout=5.1114channel_layout=5.1(side)
115output_gain_flags=0115output_gain_flags=0
116output_gain=0/1116output_gain=0/1
117[/SUBCOMPONENT]117[/SUBCOMPONENT]
118[SUBCOMPONENT]118[SUBCOMPONENT]
119channel_layout=5.1.2(back)119channel_layout=5.1.2
120output_gain_flags=0120output_gain_flags=0
121output_gain=0/1121output_gain=0/1
122[/SUBCOMPONENT]122[/SUBCOMPONENT]
@@ -327,7 +327,7 @@ dialogue_anchored_loudness=0/1 · 204 unmodified lines
327album_anchored_loudness=0/1327album_anchored_loudness=0/1
328[/PIECE]328[/PIECE]
329[PIECE]329[PIECE]
330sound_system=5.1330sound_system=5.1(side)
331integrated_loudness=0/256331integrated_loudness=0/256
332digital_peak=0/256332digital_peak=0/256
333true_peak=0/1333true_peak=0/1
@@ -335,7 +335,7 @@ dialogue_anchored_loudness=0/1 · 1 unmodified line
335album_anchored_loudness=0/1335album_anchored_loudness=0/1
336[/PIECE]336[/PIECE]
337[PIECE]337[PIECE]
338sound_system=5.1.2(back)338sound_system=5.1.2
339integrated_loudness=0/256339integrated_loudness=0/256
340digital_peak=0/256340digital_peak=0/256
341true_peak=0/1341true_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
111output_gain=0/1111output_gain=0/1
112[/SUBCOMPONENT]112[/SUBCOMPONENT]
113[SUBCOMPONENT]113[SUBCOMPONENT]
114channel_layout=5.1114channel_layout=5.1(side)
115output_gain_flags=0115output_gain_flags=0
116output_gain=0/1116output_gain=0/1
117[/SUBCOMPONENT]117[/SUBCOMPONENT]
118[SUBCOMPONENT]118[SUBCOMPONENT]
119channel_layout=5.1.2(back)119channel_layout=5.1.2
120output_gain_flags=0120output_gain_flags=0
121output_gain=0/1121output_gain=0/1
122[/SUBCOMPONENT]122[/SUBCOMPONENT]
@@ -349,7 +349,7 @@ dialogue_anchored_loudness=0/1 · 226 unmodified lines
349album_anchored_loudness=0/1349album_anchored_loudness=0/1
350[/PIECE]350[/PIECE]
351[PIECE]351[PIECE]
352sound_system=5.1352sound_system=5.1(side)
353integrated_loudness=0/256353integrated_loudness=0/256
354digital_peak=0/256354digital_peak=0/256
355true_peak=0/1355true_peak=0/1
@@ -357,7 +357,7 @@ dialogue_anchored_loudness=0/1 · 1 unmodified line
357album_anchored_loudness=0/1357album_anchored_loudness=0/1
358[/PIECE]358[/PIECE]
359[PIECE]359[PIECE]
360sound_system=5.1.2(back)360sound_system=5.1.2
361integrated_loudness=0/256361integrated_loudness=0/256
362digital_peak=0/256362digital_peak=0/256
363true_peak=0/1363true_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
2demixing=dmixp_mode=1:parameter_id=998,2demixing=dmixp_mode=1:parameter_id=998,
3recon_gain=parameter_id=101,3recon_gain=parameter_id=101,
4layer=ch_layout=stereo,4layer=ch_layout=stereo,
5layer=ch_layout=5.1,5layer=ch_layout=5.1(side),
6layer=ch_layout=5.1.2(back),6layer=ch_layout=5.1.2,
7layer=ch_layout=5.1.4,7layer=ch_layout=5.1.4,
tests/streamgroups/mix_presentation-5_1_4+1−1
@@ -1,2 +1,2 @@
1type=iamf_mix_presentation:id=2:stg=0:annotations=en-us=Mix_Presentation,1type=iamf_mix_presentation:id=2:stg=0:annotations=en-us=Mix_Presentation,
2submix=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,2submix=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