mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "ladspa-sink: Handle empty chunks in sink_input_pop_cb"

Browse source 
This reverts commit dbe66b0b5e.

I accidentally pushed this patch that was superseded by
e96785c1c3.
This commit is contained in:
Tanu Kaskinen 2014-01-15 14:24:25 +02:00
parent e96785c1c3
commit 7fd14b6f58
1 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/modules/module-ladspa-sink.c
View file

@ -474,29 +474,22 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk
pa_memblockq_drop(u->memblockq, chunk->length); pa_memblockq_drop(u->memblockq, chunk->length);
src = (tchunk.memblock ? pa_memblock_acquire_chunk(&tchunk) : NULL); src = pa_memblock_acquire_chunk(&tchunk);
dst = pa_memblock_acquire(chunk->memblock); dst = pa_memblock_acquire(chunk->memblock);
for (h = 0; h < (u->channels / u->max_ladspaport_count); h++) { for (h = 0; h < (u->channels / u->max_ladspaport_count); h++) {
if (src) { for (c = 0; c < u->input_count; c++)
for (c = 0; c < u->input_count; c++) pa_sample_clamp(PA_SAMPLE_FLOAT32NE, u->input[c], sizeof(float), src+ h*u->max_ladspaport_count + c, u->channels*sizeof(float), n);
pa_sample_clamp(PA_SAMPLE_FLOAT32NE, u->input[c], sizeof(float), src+ h*u->max_ladspaport_count + c, u->channels*sizeof(float), n);
} else {
for (c = 0; c < u->input_count; c++)
memset(u->input[c], 0, (n * sizeof(float)));
}
u->descriptor->run(u->handle[h], n); u->descriptor->run(u->handle[h], n);
for (c = 0; c < u->output_count; c++) for (c = 0; c < u->output_count; c++)
pa_sample_clamp(PA_SAMPLE_FLOAT32NE, dst + h*u->max_ladspaport_count + c, u->channels*sizeof(float), u->output[c], sizeof(float), n); pa_sample_clamp(PA_SAMPLE_FLOAT32NE, dst + h*u->max_ladspaport_count + c, u->channels*sizeof(float), u->output[c], sizeof(float), n);
} }
if (tchunk.memblock) { pa_memblock_release(tchunk.memblock);
pa_memblock_release(tchunk.memblock);
pa_memblock_unref(tchunk.memblock);
}
pa_memblock_release(chunk->memblock); pa_memblock_release(chunk->memblock);
pa_memblock_unref(tchunk.memblock);
return 0; return 0;
} }