On Fri, 2016-02-19 at 15:27 +0200, Tanu Kaskinen wrote:
> On Fri, 2016-02-19 at 14:48 +0530, Arun Raghavan wrote:
> > On Thu, 2016-02-18 at 14:58 +0200, Tanu Kaskinen wrote:
> > > On Wed, 2016-02-17 at 19:46 +0530, arun at accosted.net wrote:
> > > > From: Arun Raghavan <git at arunraghavan.net>
> > > >
> > > > Just exposing this, disabled by default. It's not used by Chromium
> > > > at
> > > > the moment.
> > > > ---
> > > > Â src/modules/echo-cancel/webrtc.cc | 14 ++++++++++++--
> > > > Â 1 file changed, 12 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/src/modules/echo-cancel/webrtc.cc b/src/modules/echo-
> > > > cancel/webrtc.cc
> > > > index ee3075f..ec63e26 100644
> > > > --- a/src/modules/echo-cancel/webrtc.cc
> > > > +++ b/src/modules/echo-cancel/webrtc.cc
> > > > @@ -47,6 +47,7 @@ PA_C_DECL_END
> > > > Â #define DEFAULT_COMFORT_NOISE true
> > > > Â #define DEFAULT_DRIFT_COMPENSATION false
> > > > Â #define DEFAULT_EXTENDED_FILTER false
> > > > +#define DEFAULT_INTELLIGIBILITY_ENHANCER false
> > > > Â
> > > > Â static const char* const valid_modargs[] = {
> > > > Â Â Â Â Â "high_pass_filter",
> > > > @@ -58,6 +59,7 @@ static const char* const valid_modargs[] = {
> > > > Â Â Â Â Â "comfort_noise",
> > > > Â Â Â Â Â "drift_compensation",
> > > > Â Â Â Â Â "extended_filter",
> > > > +Â Â Â Â "intelligibility_enhancer",
> > > > Â Â Â Â Â NULL
> > > > Â };
> > > > Â
> > > > @@ -84,7 +86,7 @@ bool pa_webrtc_ec_init(pa_core *c,
> > > > pa_echo_canceller *ec,
> > > > Â Â Â Â Â webrtc::AudioProcessing *apm = NULL;
> > > > Â Â Â Â Â webrtc::ProcessingConfig pconfig;
> > > > Â Â Â Â Â webrtc::Config config;
> > > > -Â Â Â Â bool hpf, ns, agc, dgc, mobile, cn, ext_filter;
> > > > +Â Â Â Â bool hpf, ns, agc, dgc, mobile, cn, ext_filter,
> > > > intelligibility;
> > > > Â Â Â Â Â int rm = -1;
> > > > Â Â Â Â Â pa_modargs *ma;
> > > > Â
> > > > @@ -163,8 +165,16 @@ bool pa_webrtc_ec_init(pa_core *c,
> > > > pa_echo_canceller *ec,
> > > > Â Â Â Â Â Â Â Â Â goto fail;
> > > > Â Â Â Â Â }
> > > > Â
> > > > +Â Â Â Â intelligibility = DEFAULT_INTELLIGIBILITY_ENHANCER;
> > > > +Â Â Â Â if (pa_modargs_get_value_boolean(ma,
> > > > "intelligibility_enhancer", &intelligibility) < 0) {
> > > > +Â Â Â Â Â Â Â Â pa_log("Failed to parse intelligibility_enhancer value");
> > > > +Â Â Â Â Â Â Â Â goto fail;
> > > > +Â Â Â Â }
> > > > +
> > > > Â Â Â Â Â if (ext_filter)
> > > > Â Â Â Â Â Â Â Â Â config.Set(new webrtc::ExtendedFilter(true));
> > > > +Â Â Â Â if (intelligibility)
> > > > +Â Â Â Â Â Â Â Â config.Set(new webrtc::Intelligibility(true));
> > >
> > > I see you did no changes here despite our earlier discussion. I was
> > > hoping that you'd squash patch 19 to this patch - do you mind if I do
> > > that?
> >
> > I made the change and then found this form slightly easier to read so
> > stuck with it. Please go ahead and squash (or I can do it as well if
> > you prefer).
>
> Sorry for being unclear - I didn't mean that you should have removed
> the if statement. You said you preferred that, and we agreed to keep it
> that way. I referred to my comment that it would be better to have the
> warning already in this patch, instead of adding it in a later fixup
> patch.
>
> If I move also the FIXME comment to this patch, I will reword it a bit
> to make it clear that the FIXME is mainly relevant to the
> intelligibility enhancer, and with these changes I think I will change
> the patch attribution to myself. If you want to keep yourself as the
> author, then please resubmit the patch, but otherwise I have no problem
> with doing the rebasing myself.
I can do that, no problem.
-- Arun
