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

echo-cancel: don't set latency range if the device doesn't support dynamic latency

Browse source 
pa_sink/source_set_latency_range() has an assertion that is triggered
when setting the latency range on a fixed latency device.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=102020
This commit is contained in:
Tanu Kaskinen 2017-08-03 10:38:01 +03:00
parent 7ebe7b8a35
commit 3979fba0ac
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2054,11 +2054,13 @@ int pa__init(pa_module*m) {
/* We don't want to deal with too many chunks at a time */ /* We don't want to deal with too many chunks at a time */
blocksize_usec = pa_bytes_to_usec(u->source_blocksize, &u->source->sample_spec); blocksize_usec = pa_bytes_to_usec(u->source_blocksize, &u->source->sample_spec);
pa_source_set_latency_range(u->source, blocksize_usec, blocksize_usec * MAX_LATENCY_BLOCKS); if (u->source->flags & PA_SOURCE_DYNAMIC_LATENCY)
pa_source_set_latency_range(u->source, blocksize_usec, blocksize_usec * MAX_LATENCY_BLOCKS);
pa_source_output_set_requested_latency(u->source_output, blocksize_usec * MAX_LATENCY_BLOCKS); pa_source_output_set_requested_latency(u->source_output, blocksize_usec * MAX_LATENCY_BLOCKS);
blocksize_usec = pa_bytes_to_usec(u->sink_blocksize, &u->sink->sample_spec); blocksize_usec = pa_bytes_to_usec(u->sink_blocksize, &u->sink->sample_spec);
pa_sink_set_latency_range(u->sink, blocksize_usec, blocksize_usec * MAX_LATENCY_BLOCKS); if (u->sink->flags & PA_SINK_DYNAMIC_LATENCY)
pa_sink_set_latency_range(u->sink, blocksize_usec, blocksize_usec * MAX_LATENCY_BLOCKS);
pa_sink_input_set_requested_latency(u->sink_input, blocksize_usec * MAX_LATENCY_BLOCKS); pa_sink_input_set_requested_latency(u->sink_input, blocksize_usec * MAX_LATENCY_BLOCKS);
/* The order here is important. The input/output must be put first, /* The order here is important. The input/output must be put first,