breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

avutil/channel_layout: add a 5.1.2 layout using side channels

Browse Source 
And rename the existing 5.1.2 to explicitly state it contains back channels.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2024-12-30 15:15:54 -03:00
parent 551041e384
commit da9dcaba69
9 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/ref/fate/channel_layout
View File

@@ -25,7 +25,8 @@ hexagonal FL+FR+FC+BL+BR+BC
7.1 FL+FR+FC+LFE+BL+BR+SL+SR
7.1(wide) FL+FR+FC+LFE+BL+BR+FLC+FRC
7.1(wide-side) FL+FR+FC+LFE+FLC+FRC+SL+SR
5.1.2 FL+FR+FC+LFE+BL+BR+TFL+TFR
5.1.2 FL+FR+FC+LFE+SL+SR+TFL+TFR
5.1.2(back) FL+FR+FC+LFE+BL+BR+TFL+TFR
octagonal FL+FR+FC+BL+BR+BC+SL+SR
cube FL+FR+BL+BR+TFL+TFR+TBL+TBR
5.1.4 FL+FR+FC+LFE+BL+BR+TFL+TFR+TBL+TBR

4
tests/ref/fate/iamf-5_1_4
View File

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

4
tests/ref/fate/mov-mp4-iamf-5_1_4
View File

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

2
tests/streamgroups/audio_element-5_1_4
View File

@@ -3,5 +3,5 @@ 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.2,
layer=ch_layout=5.1.2(back),
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,
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|layout=sound_system=5.1.2(back)|layout=sound_system=5.1.4,