From 144face6ad396c8d505df51af0abef9d32a1cd3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Tue, 9 Nov 2021 17:17:34 +0100
Subject: [PATCH] pipewire: module-echo-cancel: aec-webrtc: use getters with
 default

Instead of get-check-parse, use `pw_properties_get_bool()`
which does all three in one convenient function.
---
 src/modules/module-echo-cancel/aec-webrtc.cpp | 63 ++++---------------
 1 file changed, 12 insertions(+), 51 deletions(-)

diff --git a/src/modules/module-echo-cancel/aec-webrtc.cpp b/src/modules/module-echo-cancel/aec-webrtc.cpp
index 94dc608a4..c5d085cd1 100644
--- a/src/modules/module-echo-cancel/aec-webrtc.cpp
+++ b/src/modules/module-echo-cancel/aec-webrtc.cpp
@@ -46,61 +46,22 @@ static void *webrtc_create(const struct pw_properties *args, const spa_audio_inf
 	webrtc::ProcessingConfig pconfig;
 	webrtc::Config config;
 
-	const char* prop;
-	bool extended_filter;
-	bool delay_agnostic;
-	bool high_pass_filter;
-	bool noise_suppression;
-	bool gain_control;
-	bool experimental_agc;
-	bool experimental_ns;
-	bool intelligibility;
+	bool extended_filter = pw_properties_get_bool(args, "webrtc.extended_filter", true);
+	bool delay_agnostic = pw_properties_get_bool(args, "webrtc.delay_agnostic", true);
+	bool high_pass_filter = pw_properties_get_bool(args, "webrtc.high_pass_filter", true);
+	bool noise_suppression = pw_properties_get_bool(args, "webrtc.noise_suppression", true);
+
+	// Note: AGC seems to mess up with Agnostic Delay Detection, especially with speech,
+	// result in very poor performance, disable by default
+	bool gain_control = pw_properties_get_bool(args, "webrtc.gain_control", false);
 
-	if ((prop = pw_properties_get(args, "webrtc.extended_filter")) != NULL) {
-		extended_filter = pw_properties_parse_bool(prop);
-	} else {
-		extended_filter = true;
-	}
-	if ((prop = pw_properties_get(args, "webrtc.delay_agnostic")) != NULL) {
-		delay_agnostic = pw_properties_parse_bool(prop);
-	} else {
-		delay_agnostic = true;
-	}
-	if ((prop = pw_properties_get(args, "webrtc.high_pass_filter")) != NULL) {
-		high_pass_filter = pw_properties_parse_bool(prop);
-	} else {
-		high_pass_filter = true;
-	}
-	if ((prop = pw_properties_get(args, "webrtc.noise_suppression")) != NULL) {
-		noise_suppression = pw_properties_parse_bool(prop);
-	} else {
-		noise_suppression = true;
-	}
-	if ((prop = pw_properties_get(args, "webrtc.gain_control")) != NULL) {
-		gain_control = pw_properties_parse_bool(prop);
-	} else {
-		// Note: AGC seems to mess up with Agnostic Delay Detection, especially with speech,
-		// result in very poor performance, disable by default
-		gain_control = false;
-	}
 	// Disable experimental flags by default
-	if ((prop = pw_properties_get(args, "webrtc.experimental_agc")) != NULL) {
-		experimental_agc = pw_properties_parse_bool(prop);
-	} else {
-		experimental_agc = false;
-	}
-	if ((prop = pw_properties_get(args, "webrtc.experimental_ns")) != NULL) {
-		experimental_ns = pw_properties_parse_bool(prop);
-	} else {
-		experimental_ns = false;
-	}
+	bool experimental_agc = pw_properties_get_bool(args, "webrtc.experimental_agc", false);
+	bool experimental_ns = pw_properties_get_bool(args, "webrtc.experimental_ns", false);
+
 	// Intelligibility Enhancer will enforce an upmix on non-mono outputs
 	// Disable by default
-	if ((prop = pw_properties_get(args, "webrtc.intelligibility")) != NULL) {
-		intelligibility = pw_properties_parse_bool(prop);
-	} else {
-		intelligibility = false;
-	}
+	bool intelligibility = pw_properties_get_bool(args, "webrtc.intelligibility", false);
 
 	config.Set<webrtc::ExtendedFilter>(new webrtc::ExtendedFilter(extended_filter));
 	config.Set<webrtc::DelayAgnostic>(new webrtc::DelayAgnostic(delay_agnostic));