mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-07 13:30:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

echo-cancel: Fix memblockq length check.

Browse source 
In addition to changing "plen > u->blocksize" to "plen >=
u->blocksize", I also removed one of the duplicated ifs.
This commit is contained in:
Tanu Kaskinen 2012-04-25 10:51:38 +03:00 • committed by Tanu Kaskinen
parent af78613b70
commit aca1c4001d
1 changed files with 39 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

80
src/modules/echo-cancel/module-echo-cancel.c
View file

@ -806,51 +806,49 @@ static void do_push(struct userdata *u) {
/* take fixed block from recorded samples */ /* take fixed block from recorded samples */
pa_memblockq_peek_fixed_size(u->source_memblockq, u->blocksize, &rchunk); pa_memblockq_peek_fixed_size(u->source_memblockq, u->blocksize, &rchunk);
if (plen > u->blocksize) { if (plen >= u->blocksize) {
if (plen > u->blocksize) { /* take fixed block from played samples */
/* take fixed block from played samples */ pa_memblockq_peek_fixed_size(u->sink_memblockq, u->blocksize, &pchunk);
pa_memblockq_peek_fixed_size(u->sink_memblockq, u->blocksize, &pchunk);
rdata = pa_memblock_acquire(rchunk.memblock); rdata = pa_memblock_acquire(rchunk.memblock);
rdata += rchunk.index; rdata += rchunk.index;
pdata = pa_memblock_acquire(pchunk.memblock); pdata = pa_memblock_acquire(pchunk.memblock);
pdata += pchunk.index; pdata += pchunk.index;
cchunk.index = 0; cchunk.index = 0;
cchunk.length = u->blocksize; cchunk.length = u->blocksize;
cchunk.memblock = pa_memblock_new(u->source->core->mempool, cchunk.length); cchunk.memblock = pa_memblock_new(u->source->core->mempool, cchunk.length);
cdata = pa_memblock_acquire(cchunk.memblock); cdata = pa_memblock_acquire(cchunk.memblock);
if (u->save_aec) { if (u->save_aec) {
if (u->captured_file) if (u->captured_file)
unused = fwrite(rdata, 1, u->blocksize, u->captured_file); unused = fwrite(rdata, 1, u->blocksize, u->captured_file);
if (u->played_file) if (u->played_file)
unused = fwrite(pdata, 1, u->blocksize, u->played_file); unused = fwrite(pdata, 1, u->blocksize, u->played_file);
}
/* perform echo cancellation */
u->ec->run(u->ec, rdata, pdata, cdata);
if (u->save_aec) {
if (u->canceled_file)
unused = fwrite(cdata, 1, u->blocksize, u->canceled_file);
}
pa_memblock_release(cchunk.memblock);
pa_memblock_release(pchunk.memblock);
pa_memblock_release(rchunk.memblock);
/* drop consumed sink samples */
pa_memblockq_drop(u->sink_memblockq, u->blocksize);
pa_memblock_unref(pchunk.memblock);
pa_memblock_unref(rchunk.memblock);
/* the filtered samples now become the samples from our
* source */
rchunk = cchunk;
plen -= u->blocksize;
} }
/* perform echo cancellation */
u->ec->run(u->ec, rdata, pdata, cdata);
if (u->save_aec) {
if (u->canceled_file)
unused = fwrite(cdata, 1, u->blocksize, u->canceled_file);
}
pa_memblock_release(cchunk.memblock);
pa_memblock_release(pchunk.memblock);
pa_memblock_release(rchunk.memblock);
/* drop consumed sink samples */
pa_memblockq_drop(u->sink_memblockq, u->blocksize);
pa_memblock_unref(pchunk.memblock);
pa_memblock_unref(rchunk.memblock);
/* the filtered samples now become the samples from our
* source */
rchunk = cchunk;
plen -= u->blocksize;
} }
/* forward the (echo-canceled) data to the virtual source */ /* forward the (echo-canceled) data to the virtual source */