Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Samo Golež
VLC
Commits
72ee0103
Commit
72ee0103
authored
May 12, 2021
by
Thomas Guillem
Committed by
Jean-Baptiste Kempf
May 19, 2021
Browse files
aout: don't propose binaural mix mode if no module can handle it
parent
483c3c7e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/audio_output/output.c
View file @
72ee0103
...
...
@@ -559,15 +559,18 @@ static void aout_SetupMixModeChoices (audio_output_t *aout,
if
(
fmt
->
i_channels
<=
2
)
return
;
const
bool
has_spatialaudio
=
module_exists
(
"spatialaudio"
);
aout_AddMixModeChoice
(
aout
,
AOUT_MIX_MODE_UNSET
,
_
(
"Original"
),
fmt
);
if
(
fmt
->
channel_type
!=
AUDIO_CHANNEL_TYPE_AMBISONICS
)
if
(
fmt
->
channel_type
!=
AUDIO_CHANNEL_TYPE_AMBISONICS
&&
has_spatialaudio
)
aout_AddMixModeChoice
(
aout
,
AOUT_MIX_MODE_STEREO
,
_
(
"Stereo"
),
NULL
);
aout_AddMixModeChoice
(
aout
,
AOUT_MIX_MODE_BINAURAL
,
_
(
"Binaural"
),
NULL
);
if
(
has_spatialaudio
)
aout_AddMixModeChoice
(
aout
,
AOUT_MIX_MODE_BINAURAL
,
_
(
"Binaural"
),
NULL
);
/* Only propose Original and Binaural for Ambisonics content */
if
(
fmt
->
channel_type
==
AUDIO_CHANNEL_TYPE_AMBISONICS
)
if
(
fmt
->
channel_type
==
AUDIO_CHANNEL_TYPE_AMBISONICS
&&
has_spatialaudio
)
return
;
if
(
fmt
->
i_physical_channels
!=
AOUT_CHANS_4_0
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment