Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
abd58acc
Commit
abd58acc
authored
Aug 30, 2004
by
gbazin
Browse files
* modules/stream_out/transcode.c: fix for channels mapping.
parent
64ba020d
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/stream_out/transcode.c
View file @
abd58acc
...
...
@@ -872,10 +872,16 @@ static int transcode_audio_new( sout_stream_t *p_stream,
/* Sanity check for audio channels */
id
->
p_encoder
->
fmt_out
.
audio
.
i_channels
=
__MIN
(
id
->
p_encoder
->
fmt_out
.
audio
.
i_channels
,
id
->
p_decoder
->
fmt_in
.
audio
.
i_channels
);
id
->
p_encoder
->
fmt_out
.
audio
.
i_physical_channels
=
id
->
p_encoder
->
fmt_out
.
audio
.
i_original_channels
=
pi_channels_maps
[
id
->
p_encoder
->
fmt_out
.
audio
.
i_channels
];
id
->
p_decoder
->
fmt_out
.
audio
.
i_channels
);
if
(
id
->
p_decoder
->
fmt_out
.
audio
.
i_channels
==
id
->
p_encoder
->
fmt_out
.
audio
.
i_channels
)
id
->
p_encoder
->
fmt_out
.
audio
.
i_physical_channels
=
id
->
p_encoder
->
fmt_out
.
audio
.
i_original_channels
=
id
->
p_decoder
->
fmt_out
.
audio
.
i_physical_channels
;
else
id
->
p_encoder
->
fmt_out
.
audio
.
i_physical_channels
=
id
->
p_encoder
->
fmt_out
.
audio
.
i_original_channels
=
pi_channels_maps
[
id
->
p_encoder
->
fmt_out
.
audio
.
i_channels
];
/* Initialization of encoder format structures */
es_format_Init
(
&
id
->
p_encoder
->
fmt_in
,
AUDIO_ES
,
AOUT_FMT_S16_NE
);
...
...
@@ -883,7 +889,7 @@ static int transcode_audio_new( sout_stream_t *p_stream,
id
->
p_encoder
->
fmt_in
.
audio
.
i_rate
=
id
->
p_encoder
->
fmt_out
.
audio
.
i_rate
;
id
->
p_encoder
->
fmt_in
.
audio
.
i_physical_channels
=
id
->
p_encoder
->
fmt_in
.
audio
.
i_original_channels
=
pi_channels_maps
[
id
->
p_encoder
->
fmt_out
.
audio
.
i_channels
]
;
id
->
p_encoder
->
fmt_out
.
audio
.
i_
physical_
channels
;
id
->
p_encoder
->
fmt_in
.
audio
.
i_channels
=
id
->
p_encoder
->
fmt_out
.
audio
.
i_channels
;
id
->
p_encoder
->
fmt_in
.
audio
.
i_bitspersample
=
16
;
...
...
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