Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
df08e998
Commit
df08e998
authored
Jul 08, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix infinite mixing loop with dummy audio output
parent
006127ff
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
modules/misc/dummy/aout.c
modules/misc/dummy/aout.c
+1
-1
src/audio_output/mixer.c
src/audio_output/mixer.c
+3
-0
No files found.
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
Markdown
is supported
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