filter-heuristics: Only apply AEC if we're not already on a phone sink

This makes sure that we don't apply AEC on sinks that are already
connected to a "phone" device, the assumptiong being that anything
marked as such either doesn't have need it, or handles it itself.
This commit is contained in:
Arun Raghavan 2011-04-20 17:45:26 +05:30 committed by Colin Guthrie
parent b620e32289
commit 42b378b130

View file

@ -50,7 +50,7 @@ struct userdata {
}; };
static pa_hook_result_t sink_input_put_cb(pa_core *core, pa_sink_input *i, struct userdata *u) { static pa_hook_result_t sink_input_put_cb(pa_core *core, pa_sink_input *i, struct userdata *u) {
const char *role; const char *sink_role, *si_role;
pa_core_assert_ref(core); pa_core_assert_ref(core);
pa_sink_input_assert_ref(i); pa_sink_input_assert_ref(i);
@ -60,7 +60,10 @@ static pa_hook_result_t sink_input_put_cb(pa_core *core, pa_sink_input *i, struc
if (pa_proplist_gets(i->proplist, PA_PROP_FILTER_WANT)) if (pa_proplist_gets(i->proplist, PA_PROP_FILTER_WANT))
return PA_HOOK_OK; return PA_HOOK_OK;
if ((role = pa_proplist_gets(i->proplist, PA_PROP_MEDIA_ROLE)) && pa_streq(role, "phone")) if ((sink_role = pa_proplist_gets(i->sink->proplist, PA_PROP_DEVICE_INTENDED_ROLES)) && strstr(sink_role, "phone"))
return PA_HOOK_OK;
if ((si_role = pa_proplist_gets(i->proplist, PA_PROP_MEDIA_ROLE)) && pa_streq(si_role, "phone"))
pa_proplist_sets(i->proplist, PA_PROP_FILTER_WANT, "echo-cancel"); pa_proplist_sets(i->proplist, PA_PROP_FILTER_WANT, "echo-cancel");
return PA_HOOK_OK; return PA_HOOK_OK;