projects
/
platform
/
upstream
/
pulseaudio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
473b31f
)
mix: Mix the right number of streams
author
Tanu Kaskinen
<tanuk@iki.fi>
Tue, 9 Apr 2013 11:52:54 +0000
(14:52 +0300)
committer
Tanu Kaskinen
<tanuk@iki.fi>
Tue, 9 Apr 2013 11:56:18 +0000
(14:56 +0300)
Passing channels instead of nstreams to pa_mix_ch2_s16ne() caused that
only the first two streams got mixed.
BugLink:
https://bugs.freedesktop.org/show_bug.cgi?id=63093
src/pulsecore/mix.c
patch
|
blob
|
history
diff --git
a/src/pulsecore/mix.c
b/src/pulsecore/mix.c
index
786ed75
..
6ff6831
100644
(file)
--- a/
src/pulsecore/mix.c
+++ b/
src/pulsecore/mix.c
@@
-249,7
+249,7
@@
static void pa_mix_s16ne_c(pa_mix_info streams[], unsigned nstreams, unsigned ch
else if (nstreams == 2)
pa_mix2_s16ne(streams, channels, data, length);
else if (channels == 2)
- pa_mix_ch2_s16ne(streams,
channel
s, data, length);
+ pa_mix_ch2_s16ne(streams,
nstream
s, data, length);
else
pa_mix_generic_s16ne(streams, nstreams, channels, data, length);
}