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

tests: Make echo-cancel-test not crash

Browse source 
Adding AGC broke this test, so we hard-disable the volume code in test
mode. This is probably okay for now, since at least with analog AGC, the
source volume changes and the data we get is going to be with AGC
applied, but digital gain won't be encapsulated here.

Long term, we might need to figure out how to deal with this properly.
This commit is contained in:
Arun Raghavan 2015-10-21 11:45:32 +05:30
parent d084cf144a
commit a01354db00
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1558,17 +1558,23 @@ static int canceller_process_msg_cb(pa_msgobject *o, int code, void *userdata, i
/* Called by the canceller, so source I/O thread context. */ /* Called by the canceller, so source I/O thread context. */
void pa_echo_canceller_get_capture_volume(pa_echo_canceller *ec, pa_cvolume *v) { void pa_echo_canceller_get_capture_volume(pa_echo_canceller *ec, pa_cvolume *v) {
#ifndef ECHO_CANCEL_TEST
*v = ec->msg->userdata->thread_info.current_volume; *v = ec->msg->userdata->thread_info.current_volume;
#else
pa_cvolume_set(v, 1, PA_VOLUME_NORM);
#endif
} }
/* Called by the canceller, so source I/O thread context. */ /* Called by the canceller, so source I/O thread context. */
void pa_echo_canceller_set_capture_volume(pa_echo_canceller *ec, pa_cvolume *v) { void pa_echo_canceller_set_capture_volume(pa_echo_canceller *ec, pa_cvolume *v) {
#ifndef ECHO_CANCEL_TEST
if (!pa_cvolume_equal(&ec->msg->userdata->thread_info.current_volume, v)) { if (!pa_cvolume_equal(&ec->msg->userdata->thread_info.current_volume, v)) {
pa_cvolume *vol = pa_xnewdup(pa_cvolume, v, 1); pa_cvolume *vol = pa_xnewdup(pa_cvolume, v, 1);
pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(ec->msg), ECHO_CANCELLER_MESSAGE_SET_VOLUME, vol, 0, NULL, pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(ec->msg), ECHO_CANCELLER_MESSAGE_SET_VOLUME, vol, 0, NULL,
pa_xfree); pa_xfree);
} }
#endif
} }
uint32_t pa_echo_canceller_blocksize_power2(unsigned rate, unsigned ms) { uint32_t pa_echo_canceller_blocksize_power2(unsigned rate, unsigned ms) {