Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
df08e998
Commit
df08e998
authored
Jul 08, 2011
by
Rémi Denis-Courmont
Browse files
Fix infinite mixing loop with dummy audio output
parent
006127ff
Changes
2
Hide whitespace changes
Inline
Side-by-side
modules/misc/dummy/aout.c
View file @
df08e998
...
...
@@ -57,13 +57,13 @@ int OpenAudio ( vlc_object_t * p_this )
&&
var_InheritBool
(
p_this
,
"spdif"
)
)
{
p_aout
->
output
.
output
.
i_format
=
VLC_CODEC_SPDIFL
;
p_aout
->
output
.
i_nb_samples
=
A52_FRAME_NB
;
p_aout
->
output
.
output
.
i_bytes_per_frame
=
AOUT_SPDIF_SIZE
;
p_aout
->
output
.
output
.
i_frame_length
=
A52_FRAME_NB
;
}
else
p_aout
->
output
.
output
.
i_format
=
HAVE_FPU
?
VLC_CODEC_FL32
:
VLC_CODEC_S16N
;
p_aout
->
output
.
i_nb_samples
=
A52_FRAME_NB
;
/* Create the variable for the audio-device */
var_Create
(
p_aout
,
"audio-device"
,
VLC_VAR_INTEGER
|
VLC_VAR_HASCHOICE
);
...
...
src/audio_output/mixer.c
View file @
df08e998
...
...
@@ -98,6 +98,9 @@ static int MixBuffer( aout_instance_t * p_aout, float volume )
aout_fifo_t
*
p_fifo
=
&
p_input
->
fifo
;
mtime_t
now
=
mdate
();
const
unsigned
samples
=
p_aout
->
output
.
i_nb_samples
;
/* FIXME: Remove this silly constraint. Just pass buffers as they come to
* "smart" audio outputs. */
assert
(
samples
>
0
);
aout_lock_input_fifos
(
p_aout
);
aout_lock_output_fifo
(
p_aout
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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